* Merged most of the stdenv-updates branch. Some stuff didn't

merge cleanly right away (kde-4, kernel stuff) so it should be
  merged later.  But the stdenv stuff is all there.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10793

pkgs/development/interpreters/perl/default.nix

@@ -9,13 +9,19 @@ stdenv.mkDerivation {
     sha256 = "1j8vzc6lva49mwdxkzhvm78dkxyprqs4n4057amqvsh4kh6i92l1";
   };
 
-  # This patch does the following:
-  # 1) Do use the PATH environment variable to find the `pwd' command.
-  #    By default, Perl will only look for it in /lib and /usr/lib.
-  #    !!! what are the security implications of this?
-  # 2) Force the use of <errno.h>, not /usr/include/errno.h, on Linux
-  #    systems.  (This actually appears to be due to a bug in Perl.)
-  patches = [./no-sys-dirs.patch];
+  patches = [
+    # This patch does the following:
+    # 1) Do use the PATH environment variable to find the `pwd' command.
+    #    By default, Perl will only look for it in /lib and /usr/lib.
+    #    !!! what are the security implications of this?
+    # 2) Force the use of <errno.h>, not /usr/include/errno.h, on Linux
+    #    systems.  (This actually appears to be due to a bug in Perl.)
+    ./no-sys-dirs.patch
+
+    # 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
+    ./gcc-4.2.patch
+  ];
 
   setupHook = ./setup-hook.sh;
 }

pkgs/development/interpreters/perl/gcc-4.2.patch

@@ -0,0 +1,10 @@
+--- perl-5.8.x/makedepend.SH	2006-06-13 15:31:22.000000000 -0400
++++ perl-5.8.x-andy/makedepend.SH	2006-07-25 14:45:11.000000000 -0400
+@@ -167,6 +167,7 @@
+             -e '/^#.*<builtin>/d' \
+             -e '/^#.*<built-in>/d' \
+             -e '/^#.*<command line>/d' \
++            -e '/^#.*<command-line>/d' \
+ 	    -e '/^#.*"-"/d' \
+ 	    -e '/: file path prefix .* never used$/d' \
+ 	    -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \

pkgs/development/interpreters/perl/setup-hook.sh

@@ -1,7 +1,5 @@
 addPerlLibPath () {
-    if test -d $1/lib/site_perl; then
-        export PERL5LIB="${PERL5LIB}${PERL5LIB:+:}$1/lib/site_perl"
-    fi
+    addToSearchPath PERL5LIB /lib/site_perl "" $1
 }
 
 envHooks=(${envHooks[@]} addPerlLibPath)