diff options
| author | ryoon <ryoon@pkgsrc.org> | 2015-05-15 14:32:27 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2015-05-15 14:32:27 +0000 |
| commit | a914586d78ce0f47440d88f9acf7f3bb93a06614 (patch) | |
| tree | df9eef1a99602b97738e6cfff1aee88cf276b00f | |
| parent | aa3bad1455b8dcfdd879f705cfc9f66ae117ab95 (diff) | |
| download | pkgsrc-a914586d78ce0f47440d88f9acf7f3bb93a06614.tar.gz | |
Fix build under Solaris 10 x86_64.
Redo PR pkg/44999 and fix linkage.
| -rw-r--r-- | lang/perl5/distinfo | 3 | ||||
| -rw-r--r-- | lang/perl5/hacks.mk | 11 | ||||
| -rw-r--r-- | lang/perl5/patches/patch-hints_solaris__2.sh | 15 |
3 files changed, 27 insertions, 2 deletions
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo index 6d1d2a34f23..b9ab6d8fbf4 100644 --- a/lang/perl5/distinfo +++ b/lang/perl5/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.126 2015/02/25 14:56:45 wiz Exp $ +$NetBSD: distinfo,v 1.127 2015/05/15 14:32:27 ryoon Exp $ SHA1 (perl-5.20.2.tar.bz2) = 63126c683b4c79c35008a47d56f7beae876c569f RMD160 (perl-5.20.2.tar.bz2) = a24d4c70846ae4332d01d8d56696a55bf492f44b @@ -19,6 +19,7 @@ SHA1 (patch-hints_cygwin.sh) = 1b21d927d6b7379754c4cd64a2b05d3632c35470 SHA1 (patch-hints_darwin.sh) = 15596f109f317ffb14c695b4196bb37699d2f34b SHA1 (patch-hints_netbsd.sh) = 0d549a48800372d75fe34b783529a78cba90f646 SHA1 (patch-hints_sco.sh) = 8d43cdc0632799e1cdb5dc6fdb968052a9ae4216 +SHA1 (patch-hints_solaris__2.sh) = f054d36917c74df8219c0fc84e9b20fa312a56a3 SHA1 (patch-install__lib.pl) = 31e9e0fc34386542dd6a60bf6ca0a607babbd4b6 SHA1 (patch-ta) = a9d13eeec22733e4087942f217a0d47a19498a6f SHA1 (patch-zd) = 469602bc04b217f2d9929f5caeab43f77a74076f diff --git a/lang/perl5/hacks.mk b/lang/perl5/hacks.mk index 08cd9eda417..1c0ba00aa4f 100644 --- a/lang/perl5/hacks.mk +++ b/lang/perl5/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.14 2014/12/15 11:46:35 jperkin Exp $ +# $NetBSD: hacks.mk,v 1.15 2015/05/15 14:32:27 ryoon Exp $ .if !defined(PERL5_HACKS_MK) PERL5_HACKS_MK= defined @@ -75,4 +75,13 @@ PKG_HACKS+= alpha-optimisation CFLAGS+=-fno-tree-ter .endif +### [Thu May 14 23:17:20 JST 2015 : ryoon] +### Force to use /usr/sfw/lib/amd64/libgcc_s.co.1 instead. +.if !empty(MACHINE_PLATFORM:MSunOS-5.10-x86_64) +. if !empty(CC_VERSION:Mgcc-3.4.3) +BUILDLINK_PASSTHRU_RPATHDIRS+= /usr/sfw/lib/amd64 +LDFLAGS+= ${COMPILER_RPATH_FLAG}/usr/sfw/lib/amd64 +. endif +.endif + .endif # PERL5_HACKS_MK diff --git a/lang/perl5/patches/patch-hints_solaris__2.sh b/lang/perl5/patches/patch-hints_solaris__2.sh new file mode 100644 index 00000000000..7a5fbb36196 --- /dev/null +++ b/lang/perl5/patches/patch-hints_solaris__2.sh @@ -0,0 +1,15 @@ +$NetBSD: patch-hints_solaris__2.sh,v 1.1 2015/05/15 14:32:27 ryoon Exp $ + +Redo PR pkg/44999. + +--- hints/solaris_2.sh.orig 2014-12-27 11:48:52.000000000 +0000 ++++ hints/solaris_2.sh +@@ -622,7 +622,7 @@ EOM + # use that with Solaris 11 and later, but keep + # the old behavior for older Solaris versions. + case "$osvers" in +- 2.?|2.10) lddlflags="$lddlflags -G -m64" ;; ++ 2.?|2.10) lddlflags="$lddlflags -shared -m64" ;; + *) lddlflags="$lddlflags -shared -m64" ;; + esac + ;; |