pyrox.dev / nixpkgs
lol
fork atom

Fix Perl build on SmartOS

Danny Wilson b19116f6 2c80e12e

+48 -20
+1
pkgs/development/interpreters/perl/5.20/default.nix
··· 64 64 "-Dlocincpth=${libc}/include" 65 65 "-Dloclibpth=${libc}/lib" 66 66 ] 67 + ++ optional stdenv.isSunOS "-Dcc=gcc" 67 68 ++ optional enableThreading "-Dusethreads"; 68 69 69 70 configureScript = "${stdenv.shell} ./Configure";
+23 -10
pkgs/development/interpreters/perl/5.20/ld-shared.patch
··· 1 - --- perl-5.16.2/hints/solaris_2.sh.orig 2013-02-14 19:29:49.453988140 +0000 2 - +++ perl-5.16.2/hints/solaris_2.sh 2013-02-14 19:30:31.681631019 +0000 3 - @@ -568,7 +568,7 @@ 4 - # ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" 5 - # fi 6 - ldflags="$ldflags -m64" 7 - - lddlflags="$lddlflags -G -m64" 8 - + lddlflags="$lddlflags -shared -m64" 1 + $NetBSD: patch-hints_solaris__2.sh,v 1.2 2015/10/27 09:10:44 jperkin Exp $ 2 + 3 + Redo PR pkg/44999. 4 + 5 + --- perl-5.20.2/hints/solaris_2.sh.orig 2015-05-13 20:19:29.000000000 +0000 6 + +++ perl-5.20.2/hints/solaris_2.sh 7 + @@ -585,7 +585,7 @@ EOM 8 + fi 9 + fi 10 + case "${cc:-cc} -v 2>/dev/null" in 11 + - *gcc*) 12 + + *gcc*|clang*) 13 + echo 'int main() { return 0; }' > try.c 14 + case "`${cc:-cc} $ccflags -mcpu=v9 -m64 -S try.c 2>&1 | grep 'm64 is not supported by this configuration'`" in 15 + *"m64 is not supported"*) 16 + @@ -622,7 +622,7 @@ EOM 17 + # use that with Solaris 11 and later, but keep 18 + # the old behavior for older Solaris versions. 19 + case "$osvers" in 20 + - 2.?|2.10) lddlflags="$lddlflags -G -m64" ;; 21 + + 2.?|2.10) lddlflags="$lddlflags -shared -m64" ;; 22 + *) lddlflags="$lddlflags -shared -m64" ;; 23 + esac 9 24 ;; 10 - *) 11 - getconfccflags="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
+1
pkgs/development/interpreters/perl/5.22/default.nix
··· 51 51 "-Dlocincpth=${libc}/include" 52 52 "-Dloclibpth=${libc}/lib" 53 53 ] 54 + ++ optional stdenv.isSunOS "-Dcc=gcc" 54 55 ++ optional enableThreading "-Dusethreads"; 55 56 56 57 configureScript = "${stdenv.shell} ./Configure";
+23 -10
pkgs/development/interpreters/perl/5.22/ld-shared.patch
··· 1 - --- perl-5.16.2/hints/solaris_2.sh.orig 2013-02-14 19:29:49.453988140 +0000 2 - +++ perl-5.16.2/hints/solaris_2.sh 2013-02-14 19:30:31.681631019 +0000 3 - @@ -568,7 +568,7 @@ 4 - # ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" 5 - # fi 6 - ldflags="$ldflags -m64" 7 - - lddlflags="$lddlflags -G -m64" 8 - + lddlflags="$lddlflags -shared -m64" 1 + $NetBSD: patch-hints_solaris__2.sh,v 1.2 2015/10/27 09:10:44 jperkin Exp $ 2 + 3 + Redo PR pkg/44999. 4 + 5 + --- perl-5.22.0/hints/solaris_2.sh.orig 2015-05-13 20:19:29.000000000 +0000 6 + +++ perl-5.22.0/hints/solaris_2.sh 7 + @@ -585,7 +585,7 @@ EOM 8 + fi 9 + fi 10 + case "${cc:-cc} -v 2>/dev/null" in 11 + - *gcc*) 12 + + *gcc*|clang*) 13 + echo 'int main() { return 0; }' > try.c 14 + case "`${cc:-cc} $ccflags -mcpu=v9 -m64 -S try.c 2>&1 | grep 'm64 is not supported by this configuration'`" in 15 + *"m64 is not supported"*) 16 + @@ -622,7 +622,7 @@ EOM 17 + # use that with Solaris 11 and later, but keep 18 + # the old behavior for older Solaris versions. 19 + case "$osvers" in 20 + - 2.?|2.10) lddlflags="$lddlflags -G -m64" ;; 21 + + 2.?|2.10) lddlflags="$lddlflags -shared -m64" ;; 22 + *) lddlflags="$lddlflags -shared -m64" ;; 23 + esac 9 24 ;; 10 - *) 11 - getconfccflags="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"