summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorØrjan Malde <red@foxi.me>2022-07-27 18:15:29 +0200
committerØrjan Malde <red@foxi.me>2022-07-27 18:15:46 +0200
commitf522257b05beb2c89958ab6157ce08a075414cd7 (patch)
treeb5d5128897eb214fa8f5125b43a2be40537032fe
parent07bc6c31e72fb6de4e4520c783187ca7bc918636 (diff)
downloadmidipix_build-f522257b05beb2c89958ab6157ce08a075414cd7.tar.bz2
midipix_build-f522257b05beb2c89958ab6157ce08a075414cd7.tar.xz
groups/241.native_packages_inet.group: curl: build w/ --disable-socketpair
Signed-off-by: Ørjan Malde <red@foxi.me>
-rw-r--r--groups/241.native_packages_inet.group2
-rw-r--r--patches/curl-7.83.1.local.patch13
2 files changed, 1 insertions, 14 deletions
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index 4bccc1da..ed0ca8d4 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -36,7 +36,7 @@ proxytunnel rsync socat thttpd w3m weechat wget wget2 whois")";
: ${PKG_CURL_SHA256SUM:=2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4};
: ${PKG_CURL_VERSION:=7.83.1};
: ${PKG_CURL_URL:=https://curl.haxx.se/download/curl-${PKG_CURL_VERSION}.tar.xz};
-: ${PKG_CURL_CONFIGURE_ARGS_EXTRA:="--disable-symbol-hiding --enable-shared --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --with-ca-path=/etc/ssl/certs --with-gnutls --without-ssl"};
+: ${PKG_CURL_CONFIGURE_ARGS_EXTRA:="--disable-symbol-hiding --enable-shared --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --with-ca-path=/etc/ssl/certs --with-gnutls --without-ssl --disable-socketpair"};
: ${PKG_DROPBEAR_DEPENDS:="libz"};
: ${PKG_DROPBEAR_SHA256SUM:=48235d10b37775dbda59341ac0c4b239b82ad6318c31568b985730c788aac53b};
: ${PKG_DROPBEAR_VERSION:=2020.81};
diff --git a/patches/curl-7.83.1.local.patch b/patches/curl-7.83.1.local.patch
index 1b1ea433..365d6ab1 100644
--- a/patches/curl-7.83.1.local.patch
+++ b/patches/curl-7.83.1.local.patch
@@ -2190,16 +2190,3 @@
# if unit tests are enabled, build a static library to link them with
@BUILD_UNITTESTS_TRUE@noinst_LTLIBRARIES = libcurltool.la
---- curl-7.83.1/lib/multihandle.h.orig 2022-05-09 09:52:19.000000000 +0200
-+++ curl-7.83.1/lib/multihandle.h 2022-05-12 17:53:13.903809251 +0200
-@@ -70,10 +70,6 @@
-
- #define CURLPIPE_ANY (CURLPIPE_MULTIPLEX)
-
--#if !defined(CURL_DISABLE_SOCKETPAIR)
--#define ENABLE_WAKEUP
--#endif
--
- /* value for MAXIMUM CONCURRENT STREAMS upper limit */
- #define INITIAL_MAX_CONCURRENT_STREAMS ((1U << 31) - 1)
-