perl: Add 5.16.1
This commit is contained in:
Eelco Dolstra
parent
9b0ed02f9b
commit
8ed71a1ee5
63
pkgs/development/interpreters/perl/5.16/default.nix
Normal file
63
pkgs/development/interpreters/perl/5.16/default.nix
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
{ stdenv, fetchurl }:
|
||||||
|
|
||||||
|
let
|
||||||
|
|
||||||
|
libc = stdenv.gcc.libc or "/usr";
|
||||||
|
|
||||||
|
in
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "perl-5.16.1";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://cpan/src/${name}.tar.gz";
|
||||||
|
sha256 = "15qxzba3a50c9nik5ydgyfp62x7h9vxxn12yd1jgl93hb1wj96km";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches =
|
||||||
|
[ # Do not look in /usr etc. for dependencies.
|
||||||
|
./no-sys-dirs.patch
|
||||||
|
]
|
||||||
|
++ stdenv.lib.optional stdenv.isDarwin ./no-libutil.patch;
|
||||||
|
|
||||||
|
# Build a thread-safe Perl with a dynamic libperls.o. We need the
|
||||||
|
# "installstyle" option to ensure that modules are put under
|
||||||
|
# $out/lib/perl5 - this is the general default, but because $out
|
||||||
|
# contains the string "perl", Configure would select $out/lib.
|
||||||
|
# Miniperl needs -lm. perl needs -lrt.
|
||||||
|
configureFlags =
|
||||||
|
[ "-de"
|
||||||
|
"-Dcc=gcc"
|
||||||
|
"-Uinstallusrbinperl"
|
||||||
|
"-Dinstallstyle=lib/perl5"
|
||||||
|
"-Duseshrplib"
|
||||||
|
"-Dlocincpth=${libc}/include"
|
||||||
|
"-Dloclibpth=${libc}/lib"
|
||||||
|
]
|
||||||
|
++ stdenv.lib.optional (stdenv ? glibc) "-Dusethreads";
|
||||||
|
|
||||||
|
configureScript = "${stdenv.shell} ./Configure";
|
||||||
|
|
||||||
|
dontAddPrefix = true;
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
preConfigure =
|
||||||
|
''
|
||||||
|
configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
|
||||||
|
|
||||||
|
${stdenv.lib.optionalString stdenv.isArm ''
|
||||||
|
configureFlagsArray=(-Dldflags="-lm -lrt")
|
||||||
|
''}
|
||||||
|
'';
|
||||||
|
|
||||||
|
preBuild = stdenv.lib.optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools))
|
||||||
|
''
|
||||||
|
# Make Cwd work on NixOS (where we don't have a /bin/pwd).
|
||||||
|
substituteInPlace dist/Cwd/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"
|
||||||
|
'';
|
||||||
|
|
||||||
|
setupHook = ./setup-hook.sh;
|
||||||
|
|
||||||
|
passthru.libPrefix = "lib/perl5/site_perl";
|
||||||
|
}
|
||||||
12
pkgs/development/interpreters/perl/5.16/no-libutil.patch
Normal file
12
pkgs/development/interpreters/perl/5.16/no-libutil.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure
|
||||||
|
--- perl-5.14.2-orig/Configure 2011-09-26 11:44:34.000000000 +0200
|
||||||
|
+++ perl-5.14.2/Configure 2012-02-16 17:24:50.779839039 +0100
|
||||||
|
@@ -1368,7 +1368,7 @@
|
||||||
|
: 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="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
|
||||||
|
+libswanted="$libswanted m crypt sec 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.
|
||||||
|
glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
|
||||||
152
pkgs/development/interpreters/perl/5.16/no-sys-dirs.patch
Normal file
152
pkgs/development/interpreters/perl/5.16/no-sys-dirs.patch
Normal file
@ -0,0 +1,152 @@
|
|||||||
|
diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure
|
||||||
|
--- perl-5.14.2-orig/Configure 2011-09-26 11:44:34.000000000 +0200
|
||||||
|
+++ perl-5.14.2/Configure 2012-01-20 17:05:23.089223129 +0100
|
||||||
|
@@ -106,15 +106,7 @@
|
||||||
|
fi
|
||||||
|
|
||||||
|
: Proper PATH setting
|
||||||
|
-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
|
||||||
|
-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
|
||||||
|
-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
|
||||||
|
-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
|
||||||
|
-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
|
||||||
|
-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin"
|
||||||
|
-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib"
|
||||||
|
-paths="$paths /sbin /usr/sbin /usr/libexec"
|
||||||
|
-paths="$paths /system/gnu_library/bin"
|
||||||
|
+paths=''
|
||||||
|
|
||||||
|
for p in $paths
|
||||||
|
do
|
||||||
|
@@ -1311,8 +1303,7 @@
|
||||||
|
archname=''
|
||||||
|
: Possible local include directories to search.
|
||||||
|
: Set locincpth to "" in a hint file to defeat local include searches.
|
||||||
|
-locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
|
||||||
|
-locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
|
||||||
|
+locincpth=""
|
||||||
|
:
|
||||||
|
: no include file wanted by default
|
||||||
|
inclwanted=''
|
||||||
|
@@ -1328,17 +1319,12 @@
|
||||||
|
archobjs=''
|
||||||
|
libnames=''
|
||||||
|
: change the next line if compiling for Xenix/286 on Xenix/386
|
||||||
|
-xlibpth='/usr/lib/386 /lib/386'
|
||||||
|
+xlibpth=''
|
||||||
|
: Possible local library directories to search.
|
||||||
|
-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
|
||||||
|
-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
|
||||||
|
+loclibpth=""
|
||||||
|
|
||||||
|
: general looking path for locating libraries
|
||||||
|
-glibpth="/lib /usr/lib $xlibpth"
|
||||||
|
-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
|
||||||
|
-test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
|
||||||
|
-test -f /shlib/libc.so && glibpth="/shlib $glibpth"
|
||||||
|
-test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
|
||||||
|
+glibpth=""
|
||||||
|
|
||||||
|
: Private path used by Configure to find libraries. Its value
|
||||||
|
: is prepended to libpth. This variable takes care of special
|
||||||
|
@@ -1371,8 +1357,6 @@
|
||||||
|
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.
|
||||||
|
-glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
|
||||||
|
-glibpth="/usr/shlib $glibpth"
|
||||||
|
: Do not use vfork unless overridden by a hint file.
|
||||||
|
usevfork=false
|
||||||
|
|
||||||
|
@@ -2380,7 +2364,6 @@
|
||||||
|
zip
|
||||||
|
"
|
||||||
|
pth=`echo $PATH | sed -e "s/$p_/ /g"`
|
||||||
|
-pth="$pth /lib /usr/lib"
|
||||||
|
for file in $loclist; do
|
||||||
|
eval xxx=\$$file
|
||||||
|
case "$xxx" in
|
||||||
|
@@ -4785,7 +4768,7 @@
|
||||||
|
: Set private lib path
|
||||||
|
case "$plibpth" in
|
||||||
|
'') if ./mips; then
|
||||||
|
- plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib"
|
||||||
|
+ plibpth="$incpath/usr/lib"
|
||||||
|
fi;;
|
||||||
|
esac
|
||||||
|
case "$libpth" in
|
||||||
|
@@ -8390,13 +8373,8 @@
|
||||||
|
echo " "
|
||||||
|
case "$sysman" in
|
||||||
|
'')
|
||||||
|
- syspath='/usr/share/man/man1 /usr/man/man1'
|
||||||
|
- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1"
|
||||||
|
- syspath="$syspath /usr/man/u_man/man1"
|
||||||
|
- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1"
|
||||||
|
- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1"
|
||||||
|
- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1"
|
||||||
|
- sysman=`./loc . /usr/man/man1 $syspath`
|
||||||
|
+ syspath=''
|
||||||
|
+ sysman=''
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
if $test -d "$sysman"; then
|
||||||
|
@@ -19721,9 +19699,10 @@
|
||||||
|
case "$full_ar" in
|
||||||
|
'') full_ar=$ar ;;
|
||||||
|
esac
|
||||||
|
+full_ar=ar
|
||||||
|
|
||||||
|
: Store the full pathname to the sed program for use in the C program
|
||||||
|
-full_sed=$sed
|
||||||
|
+full_sed=sed
|
||||||
|
|
||||||
|
: see what type gids are declared as in the kernel
|
||||||
|
echo " "
|
||||||
|
diff -ru -x '*~' perl-5.14.2-orig/ext/Errno/Errno_pm.PL perl-5.14.2/ext/Errno/Errno_pm.PL
|
||||||
|
--- perl-5.14.2-orig/ext/Errno/Errno_pm.PL 2011-09-26 11:44:34.000000000 +0200
|
||||||
|
+++ perl-5.14.2/ext/Errno/Errno_pm.PL 2012-01-20 17:02:07.938138311 +0100
|
||||||
|
@@ -137,11 +137,7 @@
|
||||||
|
if ($dep =~ /(\S+errno\.h)/) {
|
||||||
|
$file{$1} = 1;
|
||||||
|
}
|
||||||
|
- } elsif ($^O eq 'linux' &&
|
||||||
|
- $Config{gccversion} ne '' &&
|
||||||
|
- $Config{gccversion} !~ /intel/i
|
||||||
|
- # might be using, say, Intel's icc
|
||||||
|
- ) {
|
||||||
|
+ } elsif (0) {
|
||||||
|
# Some Linuxes have weird errno.hs which generate
|
||||||
|
# no #file or #line directives
|
||||||
|
my $linux_errno_h = -e '/usr/include/errno.h' ?
|
||||||
|
diff -ru -x '*~' perl-5.14.2-orig/hints/freebsd.sh perl-5.14.2/hints/freebsd.sh
|
||||||
|
--- perl-5.14.2-orig/hints/freebsd.sh 2011-09-19 15:18:22.000000000 +0200
|
||||||
|
+++ perl-5.14.2/hints/freebsd.sh 2012-01-20 17:10:37.267924044 +0100
|
||||||
|
@@ -118,21 +118,21 @@
|
||||||
|
objformat=`/usr/bin/objformat`
|
||||||
|
if [ x$objformat = xaout ]; then
|
||||||
|
if [ -e /usr/lib/aout ]; then
|
||||||
|
- libpth="/usr/lib/aout /usr/local/lib /usr/lib"
|
||||||
|
- glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
|
||||||
|
+ libpth=""
|
||||||
|
+ glibpth=""
|
||||||
|
fi
|
||||||
|
lddlflags='-Bshareable'
|
||||||
|
else
|
||||||
|
- libpth="/usr/lib /usr/local/lib"
|
||||||
|
- glibpth="/usr/lib /usr/local/lib"
|
||||||
|
+ libpth=""
|
||||||
|
+ glibpth=""
|
||||||
|
ldflags="-Wl,-E "
|
||||||
|
lddlflags="-shared "
|
||||||
|
fi
|
||||||
|
cccdlflags='-DPIC -fPIC'
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
- libpth="/usr/lib /usr/local/lib"
|
||||||
|
- glibpth="/usr/lib /usr/local/lib"
|
||||||
|
+ libpth=""
|
||||||
|
+ glibpth=""
|
||||||
|
ldflags="-Wl,-E "
|
||||||
|
lddlflags="-shared "
|
||||||
|
cccdlflags='-DPIC -fPIC'
|
||||||
5
pkgs/development/interpreters/perl/5.16/setup-hook.sh
Normal file
5
pkgs/development/interpreters/perl/5.16/setup-hook.sh
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
addPerlLibPath () {
|
||||||
|
addToSearchPath PERL5LIB $1/lib/perl5/site_perl
|
||||||
|
}
|
||||||
|
|
||||||
|
envHooks=(${envHooks[@]} addPerlLibPath)
|
||||||
@ -2727,11 +2727,13 @@ let
|
|||||||
|
|
||||||
perl510 = callPackage ../development/interpreters/perl/5.10 { };
|
perl510 = callPackage ../development/interpreters/perl/5.10 { };
|
||||||
|
|
||||||
perl514 = callPackage ../development/interpreters/perl/5.14 {
|
perl514 = callPackage ../development/interpreters/perl/5.14 { };
|
||||||
|
|
||||||
|
perl516 = callPackage ../development/interpreters/perl/5.16 {
|
||||||
fetchurl = fetchurlBoot;
|
fetchurl = fetchurlBoot;
|
||||||
};
|
};
|
||||||
|
|
||||||
perl = if system != "i686-cygwin" then perl514 else sysPerl;
|
perl = if system != "i686-cygwin" then perl516 else sysPerl;
|
||||||
|
|
||||||
php = php5_3;
|
php = php5_3;
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user