[147130] trunk/dports/net/curl
ryandesign at macports.org
ryandesign at macports.org
Mon Mar 28 21:33:04 PDT 2016
Revision: 147130
https://trac.macports.org/changeset/147130
Author: ryandesign at macports.org
Date: 2016-03-28 21:33:04 -0700 (Mon, 28 Mar 2016)
Log Message:
-----------
curl: fix build failure with libressl
Modified Paths:
--------------
trunk/dports/net/curl/Portfile
Added Paths:
-----------
trunk/dports/net/curl/files/patch-lib-vtls-openssl.c.diff
Modified: trunk/dports/net/curl/Portfile
===================================================================
--- trunk/dports/net/curl/Portfile 2016-03-29 03:11:44 UTC (rev 147129)
+++ trunk/dports/net/curl/Portfile 2016-03-29 04:33:04 UTC (rev 147130)
@@ -40,7 +40,8 @@
depends_lib port:zlib
- patchfiles patch-curl.h.diff
+ patchfiles patch-curl.h.diff \
+ patch-lib-vtls-openssl.c.diff
configure.args --enable-ipv6 \
--without-gnutls \
Added: trunk/dports/net/curl/files/patch-lib-vtls-openssl.c.diff
===================================================================
--- trunk/dports/net/curl/files/patch-lib-vtls-openssl.c.diff (rev 0)
+++ trunk/dports/net/curl/files/patch-lib-vtls-openssl.c.diff 2016-03-29 04:33:04 UTC (rev 147130)
@@ -0,0 +1,15 @@
+Fix build with LibreSSL
+https://twitter.com/xtraemeat/status/712564874098917376
+https://github.com/curl/curl/compare/5173c499c1b1c44b3913ecce8ccc3ac5250abe72...23ab4816443e2b9fb5e2098e2002e920594421d6
+--- lib/vtls/openssl.c.orig
++++ lib/vtls/openssl.c
+@@ -95,7 +95,8 @@
+
+ #if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+ #define HAVE_ERR_REMOVE_THREAD_STATE 1
+-#if (OPENSSL_VERSION_NUMBER >= 0x10100004L)
++#if (OPENSSL_VERSION_NUMBER >= 0x10100004L) && \
++ !defined(LIBRESSL_VERSION_NUMBER)
+ /* OpenSSL 1.1.0-pre4 removed the argument! */
+ #define HAVE_ERR_REMOVE_THREAD_STATE_NOARG 1
+ #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160328/d3e31e91/attachment-0001.html>
More information about the macports-changes
mailing list