From 0846ca2e5b6cb7883ce972cec7f630b421bcc759 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Aug 2008 14:37:51 +0000
Subject: [PATCH] * Don't fixup "#! /bin/sh" in Autoconf/Automake/Libtool,
 otherwise they   will use the "fixed" path in generated files.

svn path=/nixpkgs/trunk/; revision=12485
---
 pkgs/development/tools/misc/autoconf/default.nix       |  6 ++++++
 .../tools/misc/automake/automake-1.10.x.nix            |  4 ++++
 .../development/tools/misc/automake/automake-1.7.x.nix |  4 ++++
 .../development/tools/misc/automake/automake-1.9.x.nix |  4 ++++
 pkgs/development/tools/misc/libtool/default.nix        |  8 +++++++-
 pkgs/development/tools/misc/libtool/old.nix            | 10 ++++++++++
 pkgs/top-level/all-packages.nix                        | 10 ++++++++--
 7 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/tools/misc/libtool/old.nix

diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix
index 4194fcb94bd..b4c3d371529 100644
--- a/pkgs/development/tools/misc/autoconf/default.nix
+++ b/pkgs/development/tools/misc/autoconf/default.nix
@@ -2,16 +2,22 @@
 
 stdenv.mkDerivation rec {
   name = "autoconf-2.62";
+  
   src = fetchurl {
     url = "mirror://gnu/autoconf/${name}.tar.lzma";
     sha256 = "0wc70i36cjw5kszvp50d02w8fzh2yxnsa9la6chrf7csb0dnn4jn";
   };
 
   buildInputs = [m4 perl lzma];
+  
   unpackCmd="lzma -d < $src | tar -x ";
 
   doCheck = true;
 
+  # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the
+  # "fixed" path in generated files!
+  dontPatchShebangs = true;
+
   meta = {
     homepage = http://www.gnu.org/software/autoconf/;
     description = "GNU Autoconf, a part of the GNU Build System";
diff --git a/pkgs/development/tools/misc/automake/automake-1.10.x.nix b/pkgs/development/tools/misc/automake/automake-1.10.x.nix
index accc587a480..385f614a50f 100644
--- a/pkgs/development/tools/misc/automake/automake-1.10.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.10.x.nix
@@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
+  # "fixed" path in generated files!
+  dontPatchShebangs = true;
+  
   meta = {
     homepage = http://www.gnu.org/software/automake/;
     description = "GNU Automake, a GNU standard-compliant makefile generator";
diff --git a/pkgs/development/tools/misc/automake/automake-1.7.x.nix b/pkgs/development/tools/misc/automake/automake-1.7.x.nix
index 6a0f466cf37..5c2a720aaab 100644
--- a/pkgs/development/tools/misc/automake/automake-1.7.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.7.x.nix
@@ -9,4 +9,8 @@ stdenv.mkDerivation {
     md5 = "571fd0b0598eb2a27dcf68adcfddfacb";
   };
   buildInputs = [perl autoconf];
+
+  # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
+  # "fixed" path in generated files!
+  dontPatchShebangs = true;
 }
diff --git a/pkgs/development/tools/misc/automake/automake-1.9.x.nix b/pkgs/development/tools/misc/automake/automake-1.9.x.nix
index 745964accaf..ccc2c6baac6 100644
--- a/pkgs/development/tools/misc/automake/automake-1.9.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.9.x.nix
@@ -9,4 +9,8 @@ stdenv.mkDerivation {
     md5 = "c60f77a42f103606981d456f1615f5b4";
   };
   buildInputs = [perl autoconf];
+
+  # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
+  # "fixed" path in generated files!
+  dontPatchShebangs = true;
 }
diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix
index b955ccbc3c8..23b1b3921da 100644
--- a/pkgs/development/tools/misc/libtool/default.nix
+++ b/pkgs/development/tools/misc/libtool/default.nix
@@ -2,9 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "libtool-1.5.26";
+  
   src = fetchurl {
-    url = "mirror://gnu/libtool/" + name + ".tar.gz";
+    url = "mirror://gnu/libtool/${name}.tar.gz";
     sha256 = "029ggq5kri1gjn6nfqmgw4w920gyfzscjjxbsxxidal5zqsawd8w";
   };
+  
   buildInputs = [m4 perl];
+
+  # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
+  # "fixed" path in generated files!
+  dontPatchShebangs = true;
 }
diff --git a/pkgs/development/tools/misc/libtool/old.nix b/pkgs/development/tools/misc/libtool/old.nix
new file mode 100644
index 00000000000..b955ccbc3c8
--- /dev/null
+++ b/pkgs/development/tools/misc/libtool/old.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, m4, perl}:
+
+stdenv.mkDerivation rec {
+  name = "libtool-1.5.26";
+  src = fetchurl {
+    url = "mirror://gnu/libtool/" + name + ".tar.gz";
+    sha256 = "029ggq5kri1gjn6nfqmgw4w920gyfzscjjxbsxxidal5zqsawd8w";
+  };
+  buildInputs = [m4 perl];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8534f2d0488..5556284376d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2259,6 +2259,10 @@ let pkgs = rec {
     inherit fetchurl stdenv perl m4;
   };
 
+  libtoolOld = lowPrio (import ../development/tools/misc/libtool/old.nix {
+    inherit fetchurl stdenv perl m4;
+  });
+
   lsof = import ../development/tools/misc/lsof {
     inherit fetchurl stdenv;
   };
@@ -2402,7 +2406,8 @@ let pkgs = rec {
 
   acl = useFromStdenv "acl"
     (import ../development/libraries/acl {
-      inherit stdenv fetchurl gettext attr libtool;
+      inherit stdenv fetchurl gettext attr;
+      libtool = libtoolOld;
     });
 
   adns = selectVersion ../development/libraries/adns "1.4" {
@@ -2458,7 +2463,8 @@ let pkgs = rec {
 
   attr = useFromStdenv "attr"
     (import ../development/libraries/attr {
-      inherit stdenv fetchurl libtool gettext;
+      inherit stdenv fetchurl gettext;
+      libtool = libtoolOld;
     });
 
   axis = import ../development/libraries/axis {