diff options
Diffstat (limited to 'extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff')
-rw-r--r-- | extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff | 48 |
1 files changed, 19 insertions, 29 deletions
diff --git a/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff index ee434246a..6cac91dd6 100644 --- a/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff +++ b/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff @@ -1,6 +1,6 @@ --- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2011-08-06 15:46:01.000000000 +0200 +++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-08-06 15:59:26.000000000 +0200 -@@ -91,10 +91,10 @@ +@@ -91,7 +91,7 @@ CHMOD = $(UTILS_COMMAND_PATH)chmod CMP = $(UTILS_USR_BIN_PATH)cmp COMM = $(UTILS_USR_BIN_PATH)comm @@ -8,34 +8,8 @@ +COMPRESS = $(UTILS_COMMAND_PATH)compress CP = $(UTILS_COMMAND_PATH)cp CPIO = $(UTILS_COMMAND_PATH)cpio --CUT = $(UTILS_USR_BIN_PATH)cut -+CUT = $(UTILS_COMMAND_PATH)cut - DATE = $(UTILS_COMMAND_PATH)date - DF = $(UTILS_COMMAND_PATH)df - DIFF = $(UTILS_USR_BIN_PATH)diff -@@ -141,7 +141,7 @@ - TAR = $(UTILS_COMMAND_PATH)tar - TEST = $(UTILS_USR_BIN_PATH)test - TOUCH = $(UTILS_COMMAND_PATH)touch --TR = $(UTILS_USR_BIN_PATH)tr -+TR = $(UTILS_COMMAND_PATH)tr - TRUE = $(UTILS_COMMAND_PATH)true - UNAME = $(UTILS_COMMAND_PATH)uname - UNIQ = $(UTILS_USR_BIN_PATH)uniq ---- openjdk/jdk/make/common/shared/Defs-utils.gmk 2012-02-15 14:16:25.000000000 +0100 -+++ openjdk/jdk/make/common/shared//Defs-utils.gmk.new 2012-02-15 15:06:26.400107173 +0100 -@@ -107,7 +107,7 @@ - FIND = $(UTILS_USR_BIN_PATH)find - FMT = $(UTILS_COMMAND_PATH)fmt - GDB = $(UTILS_USR_BIN_PATH)gdb --GREP = $(UTILS_COMMAND_PATH)grep -+GREP = $(UTILS_USR_BIN_PATH)grep - GUNZIP = $(UTILS_COMMAND_PATH)gunzip - # GZIP is used for solaris. Linux and windows use tar czf - GZIP = $(UTILS_COMMAND_PATH)gzip ---- openjdk/jdk/make/common/shared/Defs-utils.gmk 2012-02-15 15:11:27.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Defs-utils.gmk.new 2012-02-15 15:14:09.504446263 +0100 -@@ -101,7 +101,7 @@ + CUT = $(UTILS_USR_BIN_PATH)cut +@@ -101,13 +101,13 @@ DIRNAME = $(UTILS_USR_BIN_PATH)dirname DUMP = $(UTILS_CCS_BIN_PATH)dump ECHO = $(UTILS_COMMAND_PATH)echo @@ -44,3 +18,19 @@ EXPR = $(UTILS_USR_BIN_PATH)expr FILE = $(UTILS_USR_BIN_PATH)file FIND = $(UTILS_USR_BIN_PATH)find + FMT = $(UTILS_COMMAND_PATH)fmt + GDB = $(UTILS_USR_BIN_PATH)gdb +-GREP = $(UTILS_COMMAND_PATH)grep ++GREP = $(UTILS_USR_BIN_PATH)grep + GUNZIP = $(UTILS_COMMAND_PATH)gunzip + # GZIP is used for solaris. Linux and windows use tar czf + GZIP = $(UTILS_COMMAND_PATH)gzip +@@ -140,7 +140,7 @@ + TAIL = $(UTILS_USR_BIN_PATH)tail + TAR = $(UTILS_COMMAND_PATH)tar + TEST = $(UTILS_USR_BIN_PATH)test +-TOUCH = $(UTILS_COMMAND_PATH)touch ++TOUCH = $(UTILS_USR_BIN_PATH)touch + TR = $(UTILS_USR_BIN_PATH)tr + TRUE = $(UTILS_COMMAND_PATH)true + UNAME = $(UTILS_COMMAND_PATH)uname |