Allow absolute paths arguments for Configure (e.g. -isysroot /path)

3 files changed, 26 insertions, 9 deletions

diff --git a/security/openssl/builtin.mk b/security/openssl/builtin.mk
index 091c2d8883f..85ef49a9f76 100644
--- a/security/openssl/builtin.mk
+++ b/security/openssl/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.32 2013/02/01 12:34:15 hans Exp $
+# $NetBSD: builtin.mk,v 1.33 2013/06/13 07:51:26 adam Exp $
 
 BUILTIN_PKG:=	openssl
 
@@ -265,7 +265,7 @@ BUILD_DEFS+=	SSLDIR SSLCERTS SSLKEYS
 # If we are using the builtin version, check whether it has a *.pc
 # files or not.  If the latter, generate fake ones.
 .  if !empty(USE_BUILTIN.openssl:M[Yy][Ee][Ss])
-BUILDLINK_TARGETS+=     openssl-fake-pc
+BUILDLINK_TARGETS+=	openssl-fake-pc
 
 .    if !defined(HAS_OPENSSL_FAKE_PC)
 HAS_OPENSSL_FAKE_PC=
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index a303832d4da..85bcd56c024 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.96 2013/06/01 08:03:55 sbd Exp $
+$NetBSD: distinfo,v 1.97 2013/06/13 07:51:26 adam Exp $
 
 SHA1 (openssl-1.0.1e.tar.gz) = 3f1b1223c9e8189bfe4e186d86449775bd903460
 RMD160 (openssl-1.0.1e.tar.gz) = 380827c16f18bed4f2eb3d54a387c7c089b2b299
 Size (openssl-1.0.1e.tar.gz) = 4459777 bytes
 SHA1 (patch-aa) = c4b27857698c108fe495fe65ea8857b77e89a655
-SHA1 (patch-ac) = 3a4154ec68ea65a6c8f0f9ea6e0636def78be2da
+SHA1 (patch-ac) = 78148ee9601f67f377a3f8d841bdcf85bd7cfdfe
 SHA1 (patch-ad) = bb86ac463fc4ab8b485df5f1a4fb9c13c1fc41c3
 SHA1 (patch-ae) = 7a58f1765a3761321dcc8dafc5fe2e33207be480
 SHA1 (patch-af) = 376f474f3809365a20a53cfe1c91eca4bc02a5cd
diff --git a/security/openssl/patches/patch-ac b/security/openssl/patches/patch-ac
index 60922b7cbfb..54cd287fd2a 100644
--- a/security/openssl/patches/patch-ac
+++ b/security/openssl/patches/patch-ac
@@ -1,11 +1,12 @@
-$NetBSD: patch-ac,v 1.40 2013/02/08 15:58:02 jperkin Exp $
+$NetBSD: patch-ac,v 1.41 2013/06/13 07:51:26 adam Exp $
 
 * Avoid -fast on Solaris, creates non-portable packages which depend on
   host-specific CPU features.
+* Allow absolute paths in CFLAGS, e.g. -isysroot /path
 
 --- Configure.orig	2012-03-14 22:20:40.000000000 +0000
 +++ Configure
-@@ -223,8 +223,8 @@ my %table=(
+@@ -225,8 +225,8 @@ my %table=(
  "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
   
  #### Solaris x86 with Sun C setups
@@ -16,7 +17,7 @@ $NetBSD: patch-ac,v 1.40 2013/02/08 15:58:02 jperkin Exp $
  
  #### SPARC Solaris with GNU C setups
  "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-@@ -336,6 +336,7 @@ my %table=(
+@@ -338,6 +338,7 @@ my %table=(
  #
  "osf1-alpha-gcc", "gcc:-O3::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
  "osf1-alpha-cc",  "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
@@ -24,7 +25,7 @@ $NetBSD: patch-ac,v 1.40 2013/02/08 15:58:02 jperkin Exp $
  "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
  
  ####
-@@ -421,6 +422,25 @@ my %table=(
+@@ -423,6 +424,25 @@ my %table=(
  "BSD-ia64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "BSD-x86_64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  
@@ -50,7 +51,23 @@ $NetBSD: patch-ac,v 1.40 2013/02/08 15:58:02 jperkin Exp $
  "bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  
  "nextstep",	"cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
-@@ -1672,7 +1692,7 @@ while (<IN>)
+@@ -865,13 +885,13 @@ PROCESS_ARGS:
+ 			# The check for the option is there so scripts aren't
+ 			# broken
+ 			}
+-		elsif (/^[-+]/)
++		elsif (/^[-+\/]/)
+ 			{
+ 			if (/^-[lL](.*)$/ or /^-Wl,/)
+ 				{
+ 				$libs.=$_." ";
+ 				}
+-			elsif (/^-[^-]/ or /^\+/)
++			elsif (/^-[^-]/ or /^\+/ or /^\//)
+ 				{
+ 				$_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei;
+ 				$flags.=$_." ";
+@@ -1674,7 +1694,7 @@ while (<IN>)
  	elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
  		{
  		my $sotmp = $1;