Fix Storable build on OS X where DYLD_LIBRARY_PATH is no longer

inherited by child processes.

3 files changed, 33 insertions, 5 deletions

diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index 574cf3e1fb3..6e036dc99e7 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,16 +1,17 @@
-$NetBSD: distinfo,v 1.151 2018/08/22 08:37:46 wiz Exp $
+$NetBSD: distinfo,v 1.152 2018/09/01 08:03:02 schmonz Exp $
 
 SHA1 (perl-5.28.0.tar.xz) = c0e9e7a0dea97ec9816687d865fd461a99ef185c
 RMD160 (perl-5.28.0.tar.xz) = 34c9ad0560a2eed134e09282696bfae307cbeb6a
 SHA512 (perl-5.28.0.tar.xz) = de701e37371b81cecf06098bb2c09017bde9cebaf9537d58838d0adf605ac2ecf739897b0a73576a7adb74d4cf65591ec4d2ed1f94b7191e695f88cb7e214a39
 Size (perl-5.28.0.tar.xz) = 12410536 bytes
 SHA1 (patch-Configure) = e4ae2c84bece8823ec1bf98415706b4d2491a5e9
-SHA1 (patch-Makefile.SH) = e9353181a286f52303d09cb4ce0b2c04ec104217
+SHA1 (patch-Makefile.SH) = febb87d876a44091a761d3ef99c649f3e4bdd394
 SHA1 (patch-aa) = 3a2b39c9eb903e68ef7d03ae448c51c147c19aa1
 SHA1 (patch-ab) = 0ad5988b7cadfb13d9646a59a57f6cf884a6238a
 SHA1 (patch-ac) = 4baa8f80695687abb53d4f4e1830cf86db5b2bf7
 SHA1 (patch-caretx.c) = 9f53a9133f8dd2f962b448d7288b5b20454c86fb
 SHA1 (patch-cflags.SH) = 7ad64e5a17b876bff4bbe238abc4a57354acf4fe
+SHA1 (patch-dist_Storable_Makefile.PL) = fd8964cf3c94ba811caaf71be21650b29e4c8e50
 SHA1 (patch-hints_cygwin.sh) = 1b21d927d6b7379754c4cd64a2b05d3632c35470
 SHA1 (patch-hints_netbsd.sh) = 0d549a48800372d75fe34b783529a78cba90f646
 SHA1 (patch-hints_solaris__2.sh) = 0e54889648a6f0f2a0232c5e01bef89d245c213d
diff --git a/lang/perl5/patches/patch-Makefile.SH b/lang/perl5/patches/patch-Makefile.SH
index 731e18dc7b8..2810385f129 100644
--- a/lang/perl5/patches/patch-Makefile.SH
+++ b/lang/perl5/patches/patch-Makefile.SH
@@ -1,10 +1,12 @@
-$NetBSD: patch-Makefile.SH,v 1.6 2017/06/06 12:37:50 jperkin Exp $
+$NetBSD: patch-Makefile.SH,v 1.7 2018/09/01 08:03:02 schmonz Exp $
 
 Fix DTrace object generation.
+Fix Storable build on OS X where DYLD_LIBRARY_PATH is no longer
+inherited by child processes.
 
---- Makefile.SH.orig	2017-05-30 09:57:56.000000000 +0000
+--- Makefile.SH.orig	2018-05-21 13:22:09.000000000 +0000
 +++ Makefile.SH
-@@ -270,6 +270,7 @@ LNS = $lns
+@@ -275,6 +275,7 @@ LNS = $lns
  # NOTE: some systems don't grok "cp -f". XXX Configure test needed?
  CPS = $cp
  RMS = rm -f
@@ -12,3 +14,12 @@ Fix DTrace object generation.
  ranlib = $ranlib
  
  # The following are mentioned only to make metaconfig include the
+@@ -1167,7 +1168,7 @@ esac
+ $spitshell >>$Makefile <<EOT
+ 
+ dist/Storable/lib/Storable/Limit.pm : \$(PERL_EXE) dist/Storable/stacksize $storable_limit_dep
+-	cd dist/Storable ; \$(LDLIBPTH) \$(MAKE) lib/Storable/Limit.pm
++	cd dist/Storable ; LDLIBPTH=\$(LDLIBPTH) \$(MAKE) lib/Storable/Limit.pm
+ 
+ lib/Storable/Limit.pm : dist/Storable/lib/Storable/Limit.pm
+ 	test -d lib/Storable || mkdir lib/Storable
diff --git a/lang/perl5/patches/patch-dist_Storable_Makefile.PL b/lang/perl5/patches/patch-dist_Storable_Makefile.PL
new file mode 100644
index 00000000000..b2eb731e030
--- /dev/null
+++ b/lang/perl5/patches/patch-dist_Storable_Makefile.PL
@@ -0,0 +1,16 @@
+$NetBSD: patch-dist_Storable_Makefile.PL,v 1.1 2018/09/01 08:03:02 schmonz Exp $
+
+Fix Storable build on OS X where DYLD_LIBRARY_PATH is no longer
+inherited by child processes.
+
+--- dist/Storable/Makefile.PL.orig	2018-05-21 12:29:23.000000000 +0000
++++ dist/Storable/Makefile.PL
+@@ -95,7 +95,7 @@ sub depend {
+     "
+ $limit_pm : stacksize \$(INST_$linktype)$extra_deps
+ 	\$(MKPATH) \$(INST_LIB)
+-	\$(FULLPERLRUNINST) stacksize $options
++	\$(LDLIBPTH) \$(FULLPERLRUNINST) stacksize $options
+ 
+ release : dist
+ 	git tag \$(VERSION)