net-misc/curl: fix build for 7.55.1. bug #627960.
authorAnthony G. Basile <blueness@gentoo.org>
Fri, 18 Aug 2017 16:32:52 +0000 (12:32 -0400)
committerAnthony G. Basile <blueness@gentoo.org>
Fri, 18 Aug 2017 16:33:08 +0000 (12:33 -0400)
Package-Manager: Portage-2.3.6, Repoman-2.3.1

net-misc/curl/curl-7.55.1.ebuild
net-misc/curl/files/curl-7.55.1-fix-build.patch [new file with mode: 0644]

index 5227717914f042f2f55913f43a3be51302f735b2..62d6e1d8a33b402a4348afc948f9c1cb107debaa 100644 (file)
@@ -107,6 +107,7 @@ src_prepare() {
        eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
        eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
        eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+       eapply "${FILESDIR}"/${P}-fix-build.patch
 
        sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
 
diff --git a/net-misc/curl/files/curl-7.55.1-fix-build.patch b/net-misc/curl/files/curl-7.55.1-fix-build.patch
new file mode 100644 (file)
index 0000000..b9749d5
--- /dev/null
@@ -0,0 +1,22 @@
+index d77a884..6dcd0f1 100644
+--- a/m4/curl-confopts.m4
++++ b/m4/curl-confopts.m4
+@@ -37,14 +37,14 @@ AC_HELP_STRING([--enable-threaded-resolver],[Enable threaded resolver])
+ AC_HELP_STRING([--disable-threaded-resolver],[Disable threaded resolver]),
+   OPT_THRES=$enableval)
+   case "$OPT_THRES" in
+-    *)
+-      dnl configure option not specified
+-      want_thres="yes"
+-      ;;
+     no)
+       dnl --disable-threaded-resolver option used
+       want_thres="no"
+       ;;
++    *)
++      dnl configure option not specified
++      want_thres="yes"
++      ;;
+   esac
+   AC_MSG_RESULT([$want_thres])
+ ])