Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

net-libs/libwebsockets: Fix compile issue. #14262

Closed
wants to merge 1 commit into from
Closed

net-libs/libwebsockets: Fix compile issue. #14262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 29 additions & 0 deletions net-libs/libwebsockets/files/libwebsockets-3.2.1-socks5-noclient-compilefailure.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From a27dabfd3a422a348135e49ffd4f163cc5c6baae Mon Sep 17 00:00:00 2001
From: Jaco Kroon <jaco@iewc.co.za>
Date: Mon, 6 Jan 2020 11:52:54 +0200
Subject: [PATCH] lws_create_vhost compile failure with +SOCKS5 -client.

If LWS is build with SOCKS5 support, but WITHOUT_CLIENT then a compile
failure occurs which this fixes.

Signed-off-by: Jaco Kroon <jaco@iewc.co.za>
---
lib/core-net/vhost.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/core-net/vhost.c b/lib/core-net/vhost.c
index 69fe26a5..283b802e 100644
--- a/lib/core-net/vhost.c
+++ b/lib/core-net/vhost.c
@@ -437,7 +437,7 @@ lws_create_vhost(struct lws_context *context,
struct lws_protocols *lwsp;
int m, f = !info->pvo, fx = 0, abs_pcol_count = 0;
char buf[96];
-#if !defined(LWS_WITHOUT_CLIENT) && defined(LWS_HAVE_GETENV)
+#if (!defined(LWS_WITHOUT_CLIENT) || defined(LWS_WITH_SOCKS5)) && defined(LWS_HAVE_GETENV)
char *p;
#endif
int n;
--
2.23.0

3 changes: 2 additions & 1 deletion net-libs/libwebsockets/libwebsockets-3.2.1.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7
Expand Down Expand Up @@ -41,6 +41,7 @@ BDEPEND="dev-lang/perl"

PATCHES=(
"${FILESDIR}/libwebsockets-3.2.0-check_chown_result.patch"
"${FILESDIR}/libwebsockets-3.2.1-socks5-noclient-compilefailure.patch"
)

src_configure() {
Expand Down