summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Savchenko <bircoph@gentoo.org>2021-01-31 05:59:53 +0300
committerAndrew Savchenko <bircoph@gentoo.org>2021-01-31 05:59:53 +0300
commitc1791cb8d661fe7c8916f9787f7772da42e0b435 (patch)
treeddde6a4482c0b2e120ac6021d60d191b4a35a10a /net-proxy
parent*/*: Remove obsolete values from PYTHON_COMPAT (diff)
downloadgentoo-c1791cb8d661fe7c8916f9787f7772da42e0b435.tar.gz
gentoo-c1791cb8d661fe7c8916f9787f7772da42e0b435.tar.bz2
gentoo-c1791cb8d661fe7c8916f9787f7772da42e0b435.zip
net-proxy/privoxy: fix build without threads
Closes: https://bugs.gentoo.org/767166 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Diffstat (limited to 'net-proxy')
-rw-r--r--net-proxy/privoxy/files/privoxy-3.0.29-pthread.patch21
-rw-r--r--net-proxy/privoxy/privoxy-3.0.29.ebuild5
2 files changed, 24 insertions, 2 deletions
diff --git a/net-proxy/privoxy/files/privoxy-3.0.29-pthread.patch b/net-proxy/privoxy/files/privoxy-3.0.29-pthread.patch
new file mode 100644
index 000000000000..2890b824d7e2
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.29-pthread.patch
@@ -0,0 +1,21 @@
+diff --git a/project.h b/project.h
+index ec3c1559..6c744415 100644
+--- a/project.h
++++ b/project.h
+@@ -54,16 +54,6 @@
+ #define HASH_OF_HOST_BUF_SIZE 16
+ #endif /* FEATURE_HTTPS_INSPECTION */
+
+-#ifdef FEATURE_PTHREAD
+-# include <pthread.h>
+- typedef pthread_mutex_t privoxy_mutex_t;
+-#else
+-# ifdef _WIN32
+-# include <windows.h>
+-# endif
+- typedef CRITICAL_SECTION privoxy_mutex_t;
+-#endif
+-
+ #ifdef FEATURE_HTTPS_INSPECTION_MBEDTLS
+ #include "mbedtls/net_sockets.h"
+ #include "mbedtls/entropy.h"
diff --git a/net-proxy/privoxy/privoxy-3.0.29.ebuild b/net-proxy/privoxy/privoxy-3.0.29.ebuild
index 966001da72e1..ded50272b29d 100644
--- a/net-proxy/privoxy/privoxy-3.0.29.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.29.ebuild
@@ -47,7 +47,7 @@ REQUIRED_USE="
compression? ( zlib )
brotli? ( zlib )
fuzz? ( zlib )
- ssl? ( ^^ ( mbedtls openssl ) )
+ ssl? ( ^^ ( mbedtls openssl ) threads )
"
S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
@@ -57,13 +57,14 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.0.28-chdir.patch
"${FILESDIR}"/${PN}-3.0.28-null-termination.patch
"${FILESDIR}"/${PN}-3.0.28-strip.patch
+ "${FILESDIR}"/${P}-pthread.patch
)
pkg_pretend() {
if ! use threads; then
ewarn
ewarn "Privoxy may be very slow without threads support, consider to enable them."
- ewarn "See also http://www.privoxy.org/faq/trouble.html#GENTOO-RICERS"
+ ewarn "See also https://www.privoxy.org/faq/trouble.html#GENTOO-RICERS"
ewarn
fi
}