[141180] trunk/dports/security/libressl

[jeremyhu at macports.org]

Revision: 141180
          https://trac.macports.org/changeset/141180
Author:   jeremyhu at macports.org
Date:     2015-10-11 16:39:47 -0700 (Sun, 11 Oct 2015)
Log Message:
-----------
libressl: Ensure we build against the correct (bundled) headers

Modified Paths:
--------------
    trunk/dports/security/libressl/Portfile

Added Paths:
-----------
    trunk/dports/security/libressl/files/use-bundled-headers.patch

Modified: trunk/dports/security/libressl/Portfile
===================================================================
--- trunk/dports/security/libressl/Portfile	2015-10-11 23:33:10 UTC (rev 141179)
+++ trunk/dports/security/libressl/Portfile	2015-10-11 23:39:47 UTC (rev 141180)
@@ -6,6 +6,7 @@
 
 name                libressl
 version             2.2.3
+revision            1
 
 categories          security devel
 platforms           darwin
@@ -29,7 +30,8 @@
                     sha256  a1ccc21adf91d60e99246031b99c930c9af5e1b1b5a61b1bec87beef6f16d882
 
 patchfiles \
-    openssldir-cert.pem.patch
+    openssldir-cert.pem.patch \
+    use-bundled-headers.patch
 
 use_autoreconf  yes
 autoreconf.args -fvi

Added: trunk/dports/security/libressl/files/use-bundled-headers.patch
===================================================================
--- trunk/dports/security/libressl/files/use-bundled-headers.patch	                        (rev 0)
+++ trunk/dports/security/libressl/files/use-bundled-headers.patch	2015-10-11 23:39:47 UTC (rev 141180)
@@ -0,0 +1,42 @@
+--- Makefile.am.common.orig	2015-08-19 18:01:27.000000000 -0700
++++ Makefile.am.common	2015-10-11 16:05:26.000000000 -0700
+@@ -1,2 +1,2 @@
+-AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/compat
+-AM_CPPFLAGS = -DLIBRESSL_INTERNAL
++AM_CFLAGS =
++AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/compat -DLIBRESSL_INTERNAL
+--- crypto/Makefile.am.orig	2015-08-19 18:01:27.000000000 -0700
++++ crypto/Makefile.am	2015-10-11 16:10:26.000000000 -0700
+@@ -1,8 +1,8 @@
+ include $(top_srcdir)/Makefile.am.common
+ 
+-AM_CFLAGS += -I$(top_srcdir)/crypto/asn1
+-AM_CFLAGS += -I$(top_srcdir)/crypto/evp
+-AM_CFLAGS += -I$(top_srcdir)/crypto/modes
++AM_CPPFLAGS += -I$(top_srcdir)/crypto/asn1
++AM_CPPFLAGS += -I$(top_srcdir)/crypto/evp
++AM_CPPFLAGS += -I$(top_srcdir)/crypto/modes
+ 
+ lib_LTLIBRARIES = libcrypto.la
+ 
+@@ -11,7 +11,8 @@ EXTRA_DIST += CMakeLists.txt
+ 
+ libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined
+ libcrypto_la_LIBADD = libcompat.la libcompatnoopt.la
+-libcrypto_la_CPPFLAGS = -DLIBRESSL_INTERNAL
++libcrypto_la_CPPFLAGS = $(AM_CPPFLAGS)
++libcrypto_la_CPPFLAGS += -DLIBRESSL_INTERNAL
+ libcrypto_la_CPPFLAGS += -DOPENSSL_NO_HW_PADLOCK
+ if OPENSSL_NO_ASM
+ libcrypto_la_CPPFLAGS += -DOPENSSL_NO_ASM
+--- tls/Makefile.am	2015-10-11 16:10:59.000000000 -0700
++++ tls/Makefile.am	2015-10-11 16:20:16.000000000 -0700
+@@ -5,7 +5,7 @@ lib_LTLIBRARIES = libtls.la
+ EXTRA_DIST = VERSION
+ EXTRA_DIST += CMakeLists.txt
+ 
+-libtls_la_CPPFLAGS =
++libtls_la_CPPFLAGS = $(AM_CPPFLAGS)
+ 
+ if OPENSSLDIR_DEFINED
+ libtls_la_CPPFLAGS += -DOPENSSLDIR=\"@OPENSSLDIR@\"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151011/ff7a8595/attachment.html>