ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-16 18:37:04 +03:00
Code Issues Projects Releases Wiki Activity

* WTF.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10835
This commit is contained in:
Eelco Dolstra 2008-02-22 15:18:22 +00:00
parent 59d88c1772
commit 359e488921
3 changed files with 54 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/perl-5.8/builder.sh
View File

@ -6,7 +6,7 @@ if test "$NIX_ENFORCE_PURITY" = "1"; then
fi fi
configureScript=./Configure configureScript=./Configure
configureFlags="-de -Dcc=gcc -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3 -Uinstallusrbinperl $extraflags" configureFlags="-de -Dcc=gcc -Dprefix=$out -Uinstallusrbinperl $extraflags"
dontAddPrefix=1 dontAddPrefix=1
preBuild=preBuild preBuild=preBuild

8
pkgs/development/interpreters/perl-5.8/default.nix
View File

@ -1,12 +1,12 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "perl-5.10.0"; name = "perl-5.8.8";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://cpan/src/perl-5.10.0.tar.gz; url = mirror://cpan/src/perl-5.8.8.tar.bz2;
sha256 = "0bivbz15x02m02gqs6hs77cgjr2msfrhnvp5xqk359jg6w6llill"; sha256 = "1j8vzc6lva49mwdxkzhvm78dkxyprqs4n4057amqvsh4kh6i92l1";
}; };
patches = [ patches = [
@ -20,7 +20,7 @@ stdenv.mkDerivation {
# Patch to make Perl 5.8.8 build with GCC 4.2. Taken from # Patch to make Perl 5.8.8 build with GCC 4.2. Taken from
# http://www.nntp.perl.org/group/perl.perl5.porters/2006/11/msg117738.html # http://www.nntp.perl.org/group/perl.perl5.porters/2006/11/msg117738.html
# ./gcc-4.2.patch ./gcc-4.2.patch
]; ];
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;

103
pkgs/development/interpreters/perl-5.8/no-sys-dirs.patch
View File

@ -1,8 +1,8 @@
diff -rc perl-5.10.0-orig/Configure perl-5.10.0/Configure diff -rc perl-orig/Configure perl-5.8.6/Configure
*** perl-5.10.0-orig/Configure 2007-12-18 11:47:07.000000000 +0100 *** perl-orig/Configure 2004-09-10 08:25:52.000000000 +0200
--- perl-5.10.0/Configure 2008-02-21 17:00:40.000000000 +0100 --- perl-5.8.6/Configure 2005-03-10 12:53:28.000000000 +0100
*************** ***************
*** 104,118 **** *** 86,100 ****
fi fi
: Proper PATH setting : Proper PATH setting
@ -18,7 +18,7 @@ diff -rc perl-5.10.0-orig/Configure perl-5.10.0/Configure
for p in $paths for p in $paths
do do
--- 104,110 ---- --- 86,92 ----
fi fi
: Proper PATH setting : Proper PATH setting
@ -27,7 +27,25 @@ diff -rc perl-5.10.0-orig/Configure perl-5.10.0/Configure
for p in $paths for p in $paths
do do
*************** ***************
*** 1271,1287 **** *** 1221,1228 ****
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"
:
: no include file wanted by default
inclwanted=''
--- 1213,1219 ----
archname=''
: Possible local include directories to search.
: Set locincpth to "" in a hint file to defeat local include searches.
! locincpth=""
:
: no include file wanted by default
inclwanted=''
***************
*** 1230,1245 ****
groupstype='' groupstype=''
libnames='' libnames=''
: change the next line if compiling for Xenix/286 on Xenix/386 : change the next line if compiling for Xenix/286 on Xenix/386
@ -41,11 +59,10 @@ diff -rc perl-5.10.0-orig/Configure perl-5.10.0/Configure
! glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" ! glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
! test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" ! test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
! test -f /shlib/libc.so && glibpth="/shlib $glibpth" ! test -f /shlib/libc.so && glibpth="/shlib $glibpth"
! test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
: Private path used by Configure to find libraries. Its value : Private path used by Configure to find libraries. Its value
: is prepended to libpth. This variable takes care of special : is prepended to libpth. This variable takes care of special
--- 1263,1274 ---- --- 1221,1232 ----
groupstype='' groupstype=''
libnames='' libnames=''
: change the next line if compiling for Xenix/286 on Xenix/386 : change the next line if compiling for Xenix/286 on Xenix/386
@ -54,30 +71,12 @@ diff -rc perl-5.10.0-orig/Configure perl-5.10.0/Configure
! loclibpth="" ! loclibpth=""
: general looking path for locating libraries : general looking path for locating libraries
! glibpth="" ! glibpth="$xlibpth"
: Private path used by Configure to find libraries. Its value : Private path used by Configure to find libraries. Its value
: is prepended to libpth. This variable takes care of special : is prepended to libpth. This variable takes care of special
*************** ***************
*** 1302,1309 **** *** 1270,1277 ****
: 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"
:
: no include file wanted by default
inclwanted=''
--- 1289,1295 ----
: Possible local include directories to search.
: Set locincpth to "" in a hint file to defeat local include searches.
! locincpth=""
:
: no include file wanted by default
inclwanted=''
***************
*** 1331,1338 ****
libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
: We probably want to search /usr/shlib before most other libraries. : We probably want to search /usr/shlib before most other libraries.
: This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
@ -86,9 +85,9 @@ diff -rc perl-5.10.0-orig/Configure perl-5.10.0/Configure
: Do not use vfork unless overridden by a hint file. : Do not use vfork unless overridden by a hint file.
usevfork=false usevfork=false
--- 1317,1322 ---- --- 1257,1262 ----
*************** ***************
*** 2340,2346 **** *** 2267,2273 ****
zip zip
" "
pth=`echo $PATH | sed -e "s/$p_/ /g"` pth=`echo $PATH | sed -e "s/$p_/ /g"`
@ -96,9 +95,9 @@ diff -rc perl-5.10.0-orig/Configure perl-5.10.0/Configure
for file in $loclist; do for file in $loclist; do
eval xxx=\$$file eval xxx=\$$file
case "$xxx" in case "$xxx" in
--- 2324,2329 ---- --- 2252,2257 ----
*************** ***************
*** 8155,8167 **** *** 7910,7922 ****
echo " " echo " "
case "$sysman" in case "$sysman" in
'') '')
@ -112,7 +111,7 @@ diff -rc perl-5.10.0-orig/Configure perl-5.10.0/Configure
;; ;;
esac esac
if $test -d "$sysman"; then if $test -d "$sysman"; then
--- 8138,8145 ---- --- 7894,7901 ----
echo " " echo " "
case "$sysman" in case "$sysman" in
'') '')
@ -122,7 +121,7 @@ diff -rc perl-5.10.0-orig/Configure perl-5.10.0/Configure
esac esac
if $test -d "$sysman"; then if $test -d "$sysman"; then
*************** ***************
*** 19005,19013 **** *** 17949,17957 ****
case "$full_ar" in case "$full_ar" in
'') full_ar=$ar ;; '') full_ar=$ar ;;
esac esac
@ -132,7 +131,7 @@ diff -rc perl-5.10.0-orig/Configure perl-5.10.0/Configure
: see what type gids are declared as in the kernel : see what type gids are declared as in the kernel
echo " " echo " "
--- 18983,18992 ---- --- 17928,17937 ----
case "$full_ar" in case "$full_ar" in
'') full_ar=$ar ;; '') full_ar=$ar ;;
esac esac
@ -143,27 +142,23 @@ diff -rc perl-5.10.0-orig/Configure perl-5.10.0/Configure
: see what type gids are declared as in the kernel : see what type gids are declared as in the kernel
echo " " echo " "
diff -rc perl-5.10.0-orig/ext/Errno/Errno_pm.PL perl-5.10.0/ext/Errno/Errno_pm.PL diff -rc perl-orig/ext/Errno/Errno_pm.PL perl-5.8.6/ext/Errno/Errno_pm.PL
*** perl-5.10.0-orig/ext/Errno/Errno_pm.PL 2007-12-18 11:47:07.000000000 +0100 *** perl-orig/ext/Errno/Errno_pm.PL 2004-11-01 15:31:59.000000000 +0100
--- perl-5.10.0/ext/Errno/Errno_pm.PL 2008-02-21 17:00:02.000000000 +0100 --- perl-5.8.6/ext/Errno/Errno_pm.PL 2005-03-10 12:52:31.000000000 +0100
*************** ***************
*** 140,150 **** *** 105,111 ****
if ($dep =~ /(\S+errno\.h)/) { # Watch out for cross compiling for EPOC (usually done on linux)
$file{$1} = 1; $file{'/usr/local/epocemx/epocsdk/include/libc/sys/errno.h'} = 1;
} } elsif ($^O eq 'linux' &&
! } elsif ($^O eq 'linux' && ! $Config{gccversion} ne '' # might be using, say, Intel's icc
! $Config{gccversion} ne '' && ) {
! $Config{gccversion} !~ /intel/i
! # might be using, say, Intel's icc
! ) {
# Some Linuxes have weird errno.hs which generate # Some Linuxes have weird errno.hs which generate
# no #file or #line directives # no #file or #line directives
my $linux_errno_h = -e '/usr/include/errno.h' ? --- 105,111 ----
--- 140,146 ---- # Watch out for cross compiling for EPOC (usually done on linux)
if ($dep =~ /(\S+errno\.h)/) { $file{'/usr/local/epocemx/epocsdk/include/libc/sys/errno.h'} = 1;
$file{$1} = 1; } elsif ($^O eq 'linux' &&
} ! $Config{gccversion} eq '' # might be using, say, Intel's icc
! } elsif (0) { ) {
# Some Linuxes have weird errno.hs which generate # Some Linuxes have weird errno.hs which generate
# no #file or #line directives # no #file or #line directives
my $linux_errno_h = -e '/usr/include/errno.h' ?