perl5: avoid opportunistic linking with cryptlib

When cryptlib is installed, perl would use `-lcl` and initially fail to build due to a missing `-L${prefix}/lib`, but even if this was fixed, it would opportunistically link against `${prefix}/lib/libcl.dylib`. Another patch that removed linking against bind9 was merged in the same patch file. Closes: https://trac.macports.org/ticket/53446
macports · Feb 10, 2017 · 8cc7b62 · 8cc7b62
1 parent 5586d72
commit 8cc7b62
Show file tree

Hide file tree

Showing 13 changed files with 83 additions and 81 deletions.
diff --git a/lang/perl5/Portfile b/lang/perl5/Portfile
@@ -54,9 +54,11 @@ foreach {perl5.v perl5.subversion perl5.revision perl5.rmd160 perl5.sha256} ${pe
         patchfiles          ${perl5.major}/clean-up-paths.patch \
                             ${perl5.major}/avoid-no-cpp-precomp-PR38913.patch
 
-        # Prevent build from picking up the bind9 port's static libbind, which
-        # duplicates symbols from /usr/lib/libdl (r10638).
-        patchfiles-append   ${perl5.major}/avoid-bind9-linking.patch
+        # - Prevent build from picking up the bind9 port's static libbind, which
+        #   duplicates symbols from /usr/lib/libdl (r10638).
+        # - Don't link against cryptlib
+        #   https://trac.macports.org/ticket/53446
+        patchfiles-append   ${perl5.major}/patch-Configure-remove-libs.diff
 
         # Prevent miniperl linking from accidentally finding our libstdc++
         # https://trac.macports.org/ticket/36438

diff --git a/lang/perl5/files/5.16/avoid-bind9-linking.patch b/lang/perl5/files/5.16/avoid-bind9-linking.patch
diff --git a/lang/perl5/files/5.16/patch-Configure-remove-libs.diff b/lang/perl5/files/5.16/patch-Configure-remove-libs.diff
@@ -0,0 +1,11 @@
+--- Configure.orig
++++ Configure
+@@ -1376,7 +1376,7 @@ libswanted_uselargefiles=''
+ : set usesocks on the Configure command line to enable socks.
+ : List of libraries we want.
+ : If anyone needs extra -lxxx, put those in a hint file.
+-libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun"
++libswanted="sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun"
+ libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
+ : We probably want to search /usr/shlib before most other libraries.
+ : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
diff --git a/lang/perl5/files/5.18/avoid-bind9-linking.patch b/lang/perl5/files/5.18/avoid-bind9-linking.patch
diff --git a/lang/perl5/files/5.18/patch-Configure-remove-libs.diff b/lang/perl5/files/5.18/patch-Configure-remove-libs.diff
@@ -0,0 +1,11 @@
+--- Configure.orig
++++ Configure
+@@ -1381,7 +1381,7 @@ libswanted_uselargefiles=''
+ : set usesocks on the Configure command line to enable socks.
+ : List of libraries we want.
+ : If anyone needs extra -lxxx, put those in a hint file.
+-libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun"
++libswanted="sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun"
+ libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
+ : We probably want to search /usr/shlib before most other libraries.
+ : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
diff --git a/lang/perl5/files/5.20/avoid-bind9-linking.patch b/lang/perl5/files/5.20/avoid-bind9-linking.patch
diff --git a/lang/perl5/files/5.20/patch-Configure-remove-libs.diff b/lang/perl5/files/5.20/patch-Configure-remove-libs.diff
@@ -0,0 +1,14 @@
+* Prevent build from picking up the bind9 port's static libbind
+* Don't link against cryptlib
+  https://trac.macports.org/ticket/53446
+--- Configure.orig
++++ Configure
+@@ -1387,7 +1387,7 @@ libswanted_uselargefiles=''
+ : set usesocks on the Configure command line to enable socks.
+ : List of libraries we want.
+ : If anyone needs extra -lxxx, put those in a hint file.
+-libswanted="cl pthread socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld"
++libswanted="pthread socket inet nsl nm ndbm gdbm dbm db malloc dl ld"
+ libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD"
+ : We probably want to search /usr/shlib before most other libraries.
+ : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
diff --git a/lang/perl5/files/5.22/avoid-bind9-linking.patch b/lang/perl5/files/5.22/avoid-bind9-linking.patch
diff --git a/lang/perl5/files/5.22/patch-Configure-remove-libs.diff b/lang/perl5/files/5.22/patch-Configure-remove-libs.diff
@@ -0,0 +1,14 @@
+* Prevent build from picking up the bind9 port's static libbind
+* Don't link against cryptlib
+  https://trac.macports.org/ticket/53446
+--- Configure.orig
++++ Configure
+@@ -1455,7 +1455,7 @@ archname=''
+ : set usesocks on the Configure command line to enable socks.
+ : List of libraries we want.
+ : If anyone needs extra -lxxx, put those in a hint file.
+-libswanted="cl pthread socket bind inet nsl ndbm gdbm dbm db malloc dl ld"
++libswanted="pthread socket inet nsl ndbm gdbm dbm db malloc dl ld"
+ libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD"
+ : We probably want to search /usr/shlib before most other libraries.
+ : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
diff --git a/lang/perl5/files/5.24/avoid-bind9-linking.patch b/lang/perl5/files/5.24/avoid-bind9-linking.patch
diff --git a/lang/perl5/files/5.24/patch-Configure-remove-libs.diff b/lang/perl5/files/5.24/patch-Configure-remove-libs.diff
@@ -0,0 +1,14 @@
+* Prevent build from picking up the bind9 port's static libbind
+* Don't link against cryptlib
+  https://trac.macports.org/ticket/53446
+--- Configure.orig
++++ Configure
+@@ -1479,7 +1479,7 @@ archname=''
+ usereentrant='undef'
+ : List of libraries we want.
+ : If anyone needs extra -lxxx, put those in a hint file.
+-libswanted="cl pthread socket bind inet nsl ndbm gdbm dbm db malloc dl ld"
++libswanted="pthread socket inet nsl ndbm gdbm dbm db malloc dl ld"
+ libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD"
+ : We probably want to search /usr/shlib before most other libraries.
+ : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
diff --git a/lang/perl5/files/5.25/avoid-bind9-linking.patch b/lang/perl5/files/5.25/avoid-bind9-linking.patch
diff --git a/lang/perl5/files/5.25/patch-Configure-remove-libs.diff b/lang/perl5/files/5.25/patch-Configure-remove-libs.diff
@@ -0,0 +1,14 @@
+* Prevent build from picking up the bind9 port's static libbind
+* Don't link against cryptlib
+  https://trac.macports.org/ticket/53446
+--- Configure.orig
++++ Configure
+@@ -1497,7 +1497,7 @@ archname=''
+ usereentrant='undef'
+ : List of libraries we want.
+ : If anyone needs extra -lxxx, put those in a hint file.
+-libswanted="cl pthread socket bind inet nsl ndbm gdbm dbm db malloc dl ld"
++libswanted="pthread socket inet nsl ndbm gdbm dbm db malloc dl ld"
+ libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD"
+ : We probably want to search /usr/shlib before most other libraries.
+ : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.