Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/openjdk/patches/openjdk-6.1.10.4-fix-cmds.patch

    Contents of /trunk/openjdk/patches/openjdk-6.1.10.4-fix-cmds.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1602 - (show annotations) (download)
    Thu Jan 5 15:50:14 2012 UTC (12 years, 3 months ago) by niro
    File size: 2925 byte(s) 
    -added openjdk patches
    1 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 2011-02-28 17:02:15.000000000 +0100
    3 +++ openjdk-magellan/corba/make/common/shared/Defs-utils.gmk 2012-01-05 17:27:41.043981562 +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 @@ -124,7 +124,7 @@
    14 STRIP = $(UTILS_CCS_BIN_PATH)strip
    15 TAIL = $(UTILS_USR_BIN_PATH)tail
    16 TAR = $(UTILS_COMMAND_PATH)tar
    17 -TEST = $(UTILS_USR_BIN_PATH)test
    18 +TEST = $(UTILS_COMMAND_PATH)test
    19 TOUCH = $(UTILS_COMMAND_PATH)touch
    20 TR = $(UTILS_USR_BIN_PATH)tr
    21 TRUE = $(UTILS_COMMAND_PATH)true
    22 @@ -176,7 +176,7 @@
    23 # others have it in /usr/bin.
    24 SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
    25 $(wildcard $(UTILS_USR_BIN_PATH)sort))
    26 - NAWK = $(USRBIN_PATH)gawk
    27 + NAWK = $(UTILS_COMMAND_PATH)gawk
    28 # Intrinsic unix command, with backslash-escaped character interpretation
    29 ECHO = /bin/echo -e
    30 # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
    31 diff -Naur openjdk/jdk/make/common/shared/Defs-utils.gmk openjdk-magellan/jdk/make/common/shared/Defs-utils.gmk
    32 --- openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-02-28 17:06:10.000000000 +0100
    33 +++ openjdk-magellan/jdk/make/common/shared/Defs-utils.gmk 2012-01-05 17:28:15.731981560 +0100
    34 @@ -106,7 +106,7 @@
    35 GDB = $(UTILS_USR_BIN_PATH)gdb
    36 GREP = $(UTILS_COMMAND_PATH)grep
    37 GUNZIP = $(UTILS_COMMAND_PATH)gunzip
    38 -HEAD = $(UTILS_USR_BIN_PATH)head
    39 +HEAD = $(UTILS_COMMAND_PATH)head
    40 ID = $(UTILS_COMMAND_PATH)id
    41 ISAINFO = $(UTILS_COMMAND_PATH)isainfo
    42 KSH = $(UTILS_COMMAND_PATH)ksh
    43 @@ -136,7 +136,7 @@
    44 STRIP = $(UTILS_CCS_BIN_PATH)strip
    45 TAIL = $(UTILS_USR_BIN_PATH)tail
    46 TAR = $(UTILS_COMMAND_PATH)tar
    47 -TEST = $(UTILS_USR_BIN_PATH)test
    48 +TEST = $(UTILS_COMMAND_PATH)test
    49 TOUCH = $(UTILS_COMMAND_PATH)touch
    50 TR = $(UTILS_USR_BIN_PATH)tr
    51 TRUE = $(UTILS_COMMAND_PATH)true
    52 @@ -178,7 +178,7 @@
    53 BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
    54 $(wildcard $(UTILS_USR_BIN_PATH)basename))
    55
    56 - NAWK = $(USRBIN_PATH)gawk
    57 + NAWK = $(UTILS_COMMAND_PATH)gawk
    58 # Intrinsic unix command, with backslash-escaped character interpretation
    59 ECHO = /bin/echo -e
    60 # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)