Annotation of /trunk/java7-openjdk/patches/java7-openjdk-7.2.1-fix-cmds.patch
Parent Directory
| 
Revision Log
Revision 1658 -
(hide annotations)
(download)
Sun Feb 19 17:16:06 2012 UTC (12 years, 2 months ago) by niro
File size: 3657 byte(s)
Sun Feb 19 17:16:06 2012 UTC (12 years, 2 months ago) by niro
File size: 3657 byte(s)
-patches for java7-openjdk
| 1 | niro | 1658 | diff -Naur openjdk/corba/make/common/shared/Defs-utils.gmk openjdk-magellan/corba/make/common/shared/Defs-utils.gmk |
| 2 | --- openjdk/corba/make/common/shared/Defs-utils.gmk 2012-02-15 09:26:34.000000000 +0100 | ||
| 3 | +++ openjdk-magellan/corba/make/common/shared/Defs-utils.gmk 2012-02-19 19:04:58.293982932 +0100 | ||
| 4 | @@ -93,7 +93,7 @@ | ||
| 5 | GDB = $(UTILS_USR_BIN_PATH)gdb | ||
| 6 | GREP = $(UTILS_COMMAND_PATH)grep | ||
| 7 | GUNZIP = $(UTILS_COMMAND_PATH)gunzip | ||
| 8 | -HEAD = $(UTILS_USR_BIN_PATH)head | ||
| 9 | +HEAD = $(UTILS_COMMAND_PATH)head | ||
| 10 | ID = $(UTILS_COMMAND_PATH)id | ||
| 11 | ISAINFO = $(UTILS_COMMAND_PATH)isainfo | ||
| 12 | KSH = $(UTILS_COMMAND_PATH)ksh | ||
| 13 | @@ -107,7 +107,7 @@ | ||
| 14 | MKSINFO = $(UTILS_COMMAND_PATH)mksinfo | ||
| 15 | MSGFMT = $(UTILS_USR_BIN_PATH)msgfmt | ||
| 16 | MV = $(UTILS_COMMAND_PATH)mv | ||
| 17 | -NAWK = $(UTILS_USR_BIN_PATH)nawk | ||
| 18 | +NAWK = $(UTILS_COMMAND_PATH)nawk | ||
| 19 | NM = $(UTILS_CCS_BIN_PATH)nm | ||
| 20 | PKGMK = $(UTILS_COMMAND_PATH)pkgmk | ||
| 21 | PRINTF = $(UTILS_USR_BIN_PATH)printf | ||
| 22 | @@ -123,7 +123,7 @@ | ||
| 23 | STRIP = $(UTILS_CCS_BIN_PATH)strip | ||
| 24 | TAIL = $(UTILS_USR_BIN_PATH)tail | ||
| 25 | TAR = $(UTILS_COMMAND_PATH)tar | ||
| 26 | -TEST = $(UTILS_USR_BIN_PATH)test | ||
| 27 | +TEST = $(UTILS_COMMAND_PATH)test | ||
| 28 | TOUCH = $(UTILS_COMMAND_PATH)touch | ||
| 29 | TR = $(UTILS_USR_BIN_PATH)tr | ||
| 30 | TRUE = $(UTILS_COMMAND_PATH)true | ||
| 31 | @@ -175,7 +175,7 @@ | ||
| 32 | # others have it in /usr/bin. | ||
| 33 | SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \ | ||
| 34 | $(wildcard $(UTILS_USR_BIN_PATH)sort)) | ||
| 35 | - NAWK = $(USRBIN_PATH)gawk | ||
| 36 | + NAWK = $(UTILS_COMMAND_PATH)gawk | ||
| 37 | # Intrinsic unix command, with backslash-escaped character interpretation | ||
| 38 | ECHO = /bin/echo -e | ||
| 39 | # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not) | ||
| 40 | diff -Naur openjdk/jdk/make/common/shared/Defs-utils.gmk openjdk-magellan/jdk/make/common/shared/Defs-utils.gmk | ||
| 41 | --- openjdk/jdk/make/common/shared/Defs-utils.gmk 2012-02-15 09:26:50.000000000 +0100 | ||
| 42 | +++ openjdk-magellan/jdk/make/common/shared/Defs-utils.gmk 2012-02-19 19:06:04.359982932 +0100 | ||
| 43 | @@ -111,7 +111,7 @@ | ||
| 44 | GUNZIP = $(UTILS_COMMAND_PATH)gunzip | ||
| 45 | # GZIP is used for solaris. Linux and windows use tar czf | ||
| 46 | GZIP = $(UTILS_COMMAND_PATH)gzip | ||
| 47 | -HEAD = $(UTILS_USR_BIN_PATH)head | ||
| 48 | +HEAD = $(UTILS_COMMAND_PATH)head | ||
| 49 | HG = hg | ||
| 50 | ID = $(UTILS_COMMAND_PATH)id | ||
| 51 | ISAINFO = $(UTILS_COMMAND_PATH)isainfo | ||
| 52 | @@ -125,7 +125,7 @@ | ||
| 53 | MKSINFO = $(UTILS_COMMAND_PATH)mksinfo | ||
| 54 | MSGFMT = $(UTILS_USR_BIN_PATH)msgfmt | ||
| 55 | MV = $(UTILS_COMMAND_PATH)mv | ||
| 56 | -NAWK = $(UTILS_USR_BIN_PATH)nawk | ||
| 57 | +NAWK = $(UTILS_COMMAND_PATH)nawk | ||
| 58 | PKGMK = $(UTILS_COMMAND_PATH)pkgmk | ||
| 59 | PRINTF = $(UTILS_USR_BIN_PATH)printf | ||
| 60 | PWD = $(UTILS_COMMAND_PATH)pwd | ||
| 61 | @@ -139,7 +139,7 @@ | ||
| 62 | SORT = $(UTILS_COMMAND_PATH)sort | ||
| 63 | TAIL = $(UTILS_USR_BIN_PATH)tail | ||
| 64 | TAR = $(UTILS_COMMAND_PATH)tar | ||
| 65 | -TEST = $(UTILS_USR_BIN_PATH)test | ||
| 66 | +TEST = $(UTILS_COMMAND_PATH)test | ||
| 67 | TOUCH = $(UTILS_COMMAND_PATH)touch | ||
| 68 | TR = $(UTILS_USR_BIN_PATH)tr | ||
| 69 | TRUE = $(UTILS_COMMAND_PATH)true | ||
| 70 | @@ -195,7 +195,7 @@ | ||
| 71 | # others have it in /usr/bin. | ||
| 72 | SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \ | ||
| 73 | $(wildcard $(UTILS_USR_BIN_PATH)sort)) | ||
| 74 | - NAWK = $(USRBIN_PATH)gawk | ||
| 75 | + NAWK = $(UTILS_COMMAND_PATH)gawk | ||
| 76 | # Intrinsic unix command, with backslash-escaped character interpretation | ||
| 77 | ECHO = /bin/echo -e | ||
| 78 | # These are really in UTILS_USR_BIN_PATH on Linux |