diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-12-05 11:42:48 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-12-05 11:42:48 +0100 |
commit | a81e8c2e978cec3f878013fd7411bbca83ee8659 (patch) | |
tree | 3adf6724bc8b1e390418fabe225611703a9045be /pkgs/development/interpreters/perl | |
parent | 12e788ff44a7c0eeca3bb8cb1a11d6308c2b9b10 (diff) | |
parent | 51a5f49d700890a93c36dd50e5eca4bf6ee6966b (diff) | |
download | nixlib-a81e8c2e978cec3f878013fd7411bbca83ee8659.tar nixlib-a81e8c2e978cec3f878013fd7411bbca83ee8659.tar.gz nixlib-a81e8c2e978cec3f878013fd7411bbca83ee8659.tar.bz2 nixlib-a81e8c2e978cec3f878013fd7411bbca83ee8659.tar.lz nixlib-a81e8c2e978cec3f878013fd7411bbca83ee8659.tar.xz nixlib-a81e8c2e978cec3f878013fd7411bbca83ee8659.tar.zst nixlib-a81e8c2e978cec3f878013fd7411bbca83ee8659.zip |
Merge branch 'master' into staging
This is to get the openssl security update immediately, as it surely causes a nontrivial rebuild.
Diffstat (limited to 'pkgs/development/interpreters/perl')
9 files changed, 0 insertions, 380 deletions
diff --git a/pkgs/development/interpreters/perl/5.16/cpp-precomp.patch b/pkgs/development/interpreters/perl/5.16/cpp-precomp.patch deleted file mode 100644 index 231853fe51a6..000000000000 --- a/pkgs/development/interpreters/perl/5.16/cpp-precomp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/hints/darwin.sh 2013-05-08 11:13:45.000000000 -0600 -+++ b/hints/darwin.sh 2013-05-08 11:15:04.000000000 -0600 -@@ -129,7 +129,7 @@ - - # Avoid Apple's cpp precompiler, better for extensions - if [ "X`echo | ${cc} -no-cpp-precomp -E - 2>&1 >/dev/null`" = "X" ]; then -- cppflags="${cppflags} -no-cpp-precomp" -+ #cppflags="${cppflags} -no-cpp-precomp" - - # This is necessary because perl's build system doesn't - # apply cppflags to cc compile lines as it should. diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix deleted file mode 100644 index 568025edfd4c..000000000000 --- a/pkgs/development/interpreters/perl/5.16/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ lib, stdenv, fetchurl, enableThreading ? true }: - -let - - libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr"; - -in - -stdenv.mkDerivation rec { - name = "perl-5.16.3"; - - src = fetchurl { - url = "mirror://cpan/src/${name}.tar.gz"; - sha256 = "1dpd9lhc4723wmsn4dsn4m320qlqgyw28bvcbhnfqp2nl3f0ikv9"; - }; - - patches = - [ # Do not look in /usr etc. for dependencies. - ./no-sys-dirs.patch - ./no-impure-config-time.patch - ./fixed-man-page-date.patch - ./no-date-in-perl-binary.patch - ] - ++ lib.optional stdenv.isSunOS ./ld-shared.patch - ++ lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ; - - # There's an annoying bug on sandboxed Darwin in Perl's Cwd.pm where it looks for pwd - # in /bin/pwd and /usr/bin/pwd and then falls back on just "pwd" if it can't get them - # while at the same time erasing the PATH environment variable so it unconditionally - # fails. The code in question is guarded by a check for Mac OS, but the patch below - # doesn't have any runtime effect on other platforms. - postPatch = '' - pwd="$(type -P pwd)" - substituteInPlace dist/Cwd/Cwd.pm \ - --replace "pwd_cmd = 'pwd'" "pwd_cmd = '$pwd'" - ''; - - # 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" - "-Uinstallusrbinperl" - "-Dinstallstyle=lib/perl5" - "-Duseshrplib" - "-Dlocincpth=${libc}/include" - "-Dloclibpth=${libc}/lib" - ] - ++ lib.optional enableThreading "-Dusethreads"; - - configureScript = "${stdenv.shell} ./Configure"; - - dontAddPrefix = true; - - enableParallelBuilding = true; - - preConfigure = - '' - configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" - - ${lib.optionalString stdenv.isArm '' - configureFlagsArray=(-Dldflags="-lm -lrt") - ''} - - ${lib.optionalString stdenv.isCygwin '' - cp cygwin/cygwin.c{,.bak} - echo "#define PERLIO_NOT_STDIO 0" > tmp - cat tmp cygwin/cygwin.c.bak > cygwin/cygwin.c - ''} - ''; - - preBuild = lib.optionalString (!(stdenv ? cc && stdenv.cc.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"; -} diff --git a/pkgs/development/interpreters/perl/5.16/fixed-man-page-date.patch b/pkgs/development/interpreters/perl/5.16/fixed-man-page-date.patch deleted file mode 100644 index 79f9bc3658e3..000000000000 --- a/pkgs/development/interpreters/perl/5.16/fixed-man-page-date.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cpan/podlators/lib/Pod/Man.pm 2014-04-07 06:25:23.730505243 +0200 -+++ b/cpan/podlators/lib/Pod/Man.pm 2014-04-07 06:26:40.816552603 +0200 -@@ -768,7 +768,7 @@ - } else { - ($name, $section) = $self->devise_title; - } -- my $date = $$self{date} || $self->devise_date; -+ my $date = "1970-01-01"; # Fixed date for NixOS, orig: $$self{date} || $self->devise_date; - $self->preamble ($name, $section, $date) - unless $self->bare_output or DEBUG > 9; - diff --git a/pkgs/development/interpreters/perl/5.16/ld-shared.patch b/pkgs/development/interpreters/perl/5.16/ld-shared.patch deleted file mode 100644 index be45230c8a73..000000000000 --- a/pkgs/development/interpreters/perl/5.16/ld-shared.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- perl-5.16.2/hints/solaris_2.sh.orig 2013-02-14 19:29:49.453988140 +0000 -+++ perl-5.16.2/hints/solaris_2.sh 2013-02-14 19:30:31.681631019 +0000 -@@ -568,7 +568,7 @@ - # ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" - # fi - ldflags="$ldflags -m64" -- lddlflags="$lddlflags -G -m64" -+ lddlflags="$lddlflags -shared -m64" - ;; - *) - getconfccflags="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" diff --git a/pkgs/development/interpreters/perl/5.16/no-date-in-perl-binary.patch b/pkgs/development/interpreters/perl/5.16/no-date-in-perl-binary.patch deleted file mode 100644 index 00ea47ae45f6..000000000000 --- a/pkgs/development/interpreters/perl/5.16/no-date-in-perl-binary.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/perl.c 2014-04-07 07:58:01.402831615 +0200 -+++ b/perl.c 2014-04-07 07:59:38.556945298 +0200 -@@ -1754,7 +1754,7 @@ - PUSHs(Perl_newSVpvn_flags(aTHX_ non_bincompat_options, - sizeof(non_bincompat_options) - 1, SVs_TEMP)); - --#ifdef __DATE__ -+#if 0 - # ifdef __TIME__ - PUSHs(Perl_newSVpvn_flags(aTHX_ - STR_WITH_LEN("Compiled at " __DATE__ " " __TIME__), diff --git a/pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch b/pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch deleted file mode 100644 index 1382de70625e..000000000000 --- a/pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Configure 2014-04-05 20:21:33.714635700 +0200 -+++ b/Configure 2014-04-05 20:23:23.377441026 +0200 -@@ -3609,6 +3609,8 @@ - - : who configured the system - cf_time=`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1` -+cf_time='Thu Jan 1 00:00:01 UTC 1970' -+ - case "$cf_by" in - "") - cf_by=`(logname) 2>/dev/null` diff --git a/pkgs/development/interpreters/perl/5.16/no-libutil.patch b/pkgs/development/interpreters/perl/5.16/no-libutil.patch deleted file mode 100644 index 9b749bccf32c..000000000000 --- a/pkgs/development/interpreters/perl/5.16/no-libutil.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 ! !'` diff --git a/pkgs/development/interpreters/perl/5.16/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.16/no-sys-dirs.patch deleted file mode 100644 index 883b24889c37..000000000000 --- a/pkgs/development/interpreters/perl/5.16/no-sys-dirs.patch +++ /dev/null @@ -1,225 +0,0 @@ -diff --git a/Configure b/Configure -index fdbbf20..ba1fd07 100755 ---- a/Configure -+++ b/Configure -@@ -106,15 +106,7 @@ if test -d c:/. || ( uname -a | grep -i 'os\(/\|\)2' ) 2>&1 >/dev/null ; then - 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 -@@ -1323,8 +1315,7 @@ archobjs='' - 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='' -@@ -1335,17 +1326,12 @@ DEBUGGING='' - - 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 -@@ -1380,8 +1366,6 @@ 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" - : 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 - -@@ -2389,7 +2373,6 @@ uname - 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 -@@ -4708,7 +4691,7 @@ $rm -f testcpp.c testcpp.out - : 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 -@@ -8354,13 +8337,8 @@ esac - 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 -@@ -19742,9 +19720,10 @@ $rm_try tryp - 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 --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL -index 439f254..2cdfdb0 100644 ---- a/ext/Errno/Errno_pm.PL -+++ b/ext/Errno/Errno_pm.PL -@@ -137,11 +137,7 @@ sub get_files { - 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 --git a/hints/freebsd.sh b/hints/freebsd.sh -index a67c0bb..0f07ca5 100644 ---- a/hints/freebsd.sh -+++ b/hints/freebsd.sh -@@ -119,21 +119,21 @@ case "$osvers" in - 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' -diff --git a/hints/linux.sh b/hints/linux.sh -index 688c68d..c12f5f5 100644 ---- a/hints/linux.sh -+++ b/hints/linux.sh -@@ -60,17 +60,6 @@ libswanted="$*" - # Debian 4.0 puts ndbm in the -lgdbm_compat library. - libswanted="$libswanted gdbm_compat" - --# If you have glibc, then report the version for ./myconfig bug reporting. --# (Configure doesn't need to know the specific version since it just uses --# gcc to load the library for all tests.) --# We don't use __GLIBC__ and __GLIBC_MINOR__ because they --# are insufficiently precise to distinguish things like --# libc-2.0.6 and libc-2.0.7. --if test -L /lib/libc.so.6; then -- libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'` -- libc=/lib/$libc --fi -- - # Configure may fail to find lstat() since it's a static/inline - # function in <sys/stat.h>. - d_lstat=define -@@ -154,24 +143,6 @@ case "$optimize" in - ;; - esac - --# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries --# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us --# where to look. We don't want gcc's own libraries, however, so we --# filter those out. --# This could be conditional on Unbuntu, but other distributions may --# follow suit, and this scheme seems to work even on rather old gcc's. --# This unconditionally uses gcc because even if the user is using another --# compiler, we still need to find the math library and friends, and I don't --# know how other compilers will cope with that situation. --# Morever, if the user has their own gcc earlier in $PATH than the system gcc, --# we don't want its libraries. So we try to prefer the system gcc --# Still, as an escape hatch, allow Configure command line overrides to --# plibpth to bypass this check. --if [ -x /usr/bin/gcc ] ; then -- gcc=/usr/bin/gcc --else -- gcc=gcc --fi - - case "$plibpth" in - '') plibpth=`LANG=C LC_ALL=C $gcc -print-search-dirs | grep libraries | -@@ -345,22 +316,6 @@ sparc*) - ;; - esac - --# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than --# true libraries. The scripts cause binding against static --# version of -lgdbm which is a bad idea. So if we have 'nm' --# make sure it can read the file --# NI-S 2003/08/07 --if [ -r /usr/lib/libndbm.so -a -x /usr/bin/nm ] ; then -- if /usr/bin/nm /usr/lib/libndbm.so >/dev/null 2>&1 ; then -- echo 'Your shared -lndbm seems to be a real library.' -- else -- echo 'Your shared -lndbm is not a real library.' -- set `echo X "$libswanted "| sed -e 's/ ndbm / /'` -- shift -- libswanted="$*" -- fi --fi -- - - # This script UU/usethreads.cbu will get 'called-back' by Configure - # after it has prompted the user for whether to use threads. diff --git a/pkgs/development/interpreters/perl/5.16/setup-hook.sh b/pkgs/development/interpreters/perl/5.16/setup-hook.sh deleted file mode 100644 index a8656b8531db..000000000000 --- a/pkgs/development/interpreters/perl/5.16/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addPerlLibPath () { - addToSearchPath PERL5LIB $1/lib/perl5/site_perl -} - -envHooks+=(addPerlLibPath) |