diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
| commit | 6dc839d3445e66b259361f08838a8c05b1912e68 (patch) | |
| tree | 5ef88f8fe4cb6f75cf0a1c1e821945c7186491c7 /pkgs/development/libraries/java/icedtea/nixos-slash-bin.patch | |
| parent | 4309788df022c89765cd7f6b178f4ce7a08db600 (diff) | |
| parent | 327a2eae30b48277bd453842d03a144f618822b2 (diff) | |
| download | nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.gz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.bz2 nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.lz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.xz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.zst nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.zip | |
Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
Diffstat (limited to 'pkgs/development/libraries/java/icedtea/nixos-slash-bin.patch')
| -rw-r--r-- | pkgs/development/libraries/java/icedtea/nixos-slash-bin.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/pkgs/development/libraries/java/icedtea/nixos-slash-bin.patch b/pkgs/development/libraries/java/icedtea/nixos-slash-bin.patch new file mode 100644 index 000000000000..df4d1f4d03f9 --- /dev/null +++ b/pkgs/development/libraries/java/icedtea/nixos-slash-bin.patch @@ -0,0 +1,20 @@ +Remove references to /bin/echo to allow NixOS builds. + +--- openjdk/jdk/make/common/shared/Defs-utils.gmk 2009-04-24 09:33:55.000000000 +0200 ++++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2010-01-19 15:39:29.000000000 +0100 +@@ -177,7 +177,7 @@ ifeq ($(PLATFORM),linux) + + NAWK = $(USRBIN_PATH)gawk + # Intrinsic unix command, with backslash-escaped character interpretation +- ECHO = /bin/echo -e ++ ECHO = echo -e + # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not) + AR = $(UTILS_USR_BIN_PATH)ar + AS = $(UTILS_USR_BIN_PATH)as +@@ -195,6 +195,6 @@ ifeq ($(PLATFORM),solaris) + # Intrinsic unix command, with backslash-escaped character interpretation + # (not using -e will cause build failure when using /bin/bash) + # (using -e breaks something else) +- ECHO = /usr/bin/echo ++ ECHO = echo + endif |