From 51963088473a705d1a035c1e00ef624f156597ed Mon Sep 17 00:00:00 2001 From: bsiegert Date: Sat, 22 Nov 2014 15:45:41 +0000 Subject: Declare MACOSX_DEPLOYMENT_TARGET for versions from 10.3 to 10.5 to fix the build. Patch provided by Sevan Janiyan in PR pkg/49394. --- lang/perl5/distinfo | 4 ++-- lang/perl5/patches/patch-hints_darwin.sh | 26 +++++++++++++++++--------- 2 files changed, 19 insertions(+), 11 deletions(-) (limited to 'lang') diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo index 446c94af5ff..e743325c483 100644 --- a/lang/perl5/distinfo +++ b/lang/perl5/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.124 2014/10/01 07:17:02 adam Exp $ +$NetBSD: distinfo,v 1.125 2014/11/22 15:45:41 bsiegert Exp $ SHA1 (perl-5.20.1.tar.bz2) = cd424d1520ba2686fe5d4422565aaf880e9467f6 RMD160 (perl-5.20.1.tar.bz2) = 8a33e7ef2cbe4b11c83187176656454794f6d26d @@ -18,7 +18,7 @@ SHA1 (patch-dist_Data-Dumper_Dumper.pm) = 27f9bb4084aa0b21b05bd10d850942b978f7f8 SHA1 (patch-dist_Data-Dumper_Dumper.xs) = 2e3384973a70b46f8f9ed72c0e9966e00fcbd8af SHA1 (patch-ext_Errno_Errno__pm.PL) = 4f135e267da17de38f8f1e7e03d5209bfd09a323 SHA1 (patch-hints_cygwin.sh) = 1b21d927d6b7379754c4cd64a2b05d3632c35470 -SHA1 (patch-hints_darwin.sh) = c561d1862f8ca76652a35741c691394eb8cda70a +SHA1 (patch-hints_darwin.sh) = 15596f109f317ffb14c695b4196bb37699d2f34b SHA1 (patch-hints_netbsd.sh) = 16a8b649e23b1d03f4756ec283da44cc08ea9a6b SHA1 (patch-hints_sco.sh) = 8d43cdc0632799e1cdb5dc6fdb968052a9ae4216 SHA1 (patch-install__lib.pl) = 31e9e0fc34386542dd6a60bf6ca0a607babbd4b6 diff --git a/lang/perl5/patches/patch-hints_darwin.sh b/lang/perl5/patches/patch-hints_darwin.sh index cc1d80e27a9..054f6ae493b 100644 --- a/lang/perl5/patches/patch-hints_darwin.sh +++ b/lang/perl5/patches/patch-hints_darwin.sh @@ -1,17 +1,25 @@ -$NetBSD: patch-hints_darwin.sh,v 1.4 2013/07/18 07:21:02 adam Exp $ +$NetBSD: patch-hints_darwin.sh,v 1.5 2014/11/22 15:45:41 bsiegert Exp $ -Don't set MACOSX_DEPLOYMENT_TARGET. +MACOSX_DEVELOPMENT_TARGET is required on version of OS X pre 10.6 +See Perl bug #117433 ---- hints/darwin.sh.orig 2013-05-07 14:45:09.000000000 +0000 +--- hints/darwin.sh.orig 2014-09-14 11:31:02.000000000 +0000 +++ hints/darwin.sh -@@ -183,10 +183,6 @@ case "$osvers" in +@@ -185,13 +185,16 @@ case "$osvers" in + ldflags="${ldflags} -flat_namespace" + lddlflags="${ldflags} -bundle -undefined suppress" ;; - *) +-*) ++[7-9].*) lddlflags="${ldflags} -bundle -undefined dynamic_lookup" -- case "$ld" in -- *MACOSX_DEVELOPMENT_TARGET*) ;; -- *) ld="env MACOSX_DEPLOYMENT_TARGET=10.3 ${ld}" ;; -- esac + case "$ld" in + *MACOSX_DEVELOPMENT_TARGET*) ;; + *) ld="env MACOSX_DEPLOYMENT_TARGET=10.3 ${ld}" ;; + esac ;; ++*) ++ lddlflags="${ldflags} -bundle -undefined dynamic_lookup" ++ ;; esac ldlibpthname='DYLD_LIBRARY_PATH'; + -- cgit v1.2.3