diff -urN icedtea6-hg/Makefile.am icedtea6-hg-mod/Makefile.am --- icedtea6-hg/Makefile.am 2011-12-06 19:39:15.000000000 -0600 +++ icedtea6-hg-mod/Makefile.am 2011-12-06 21:32:21.737424651 -0600 @@ -288,6 +288,7 @@ patches/openjdk/6650759-missing_inference.patch \ patches/numa_on_early_glibc.patch \ patches/jtreg-international-fonts.patch \ + patches/openjdk6-b24-smgl-paths.patch \ patches/f14-fonts.patch \ patches/jtreg-T6638712-fix.patch \ patches/jtreg-T6650759m-fix.patch \ diff -urN icedtea6-hg/patches/openjdk6-b24-smgl-paths.patch icedtea6-hg-mod/patches/openjdk6-b24-smgl-paths.patch --- icedtea6-hg/patches/openjdk6-b24-smgl-paths.patch 1969-12-31 18:00:00.000000000 -0600 +++ icedtea6-hg-mod/patches/openjdk6-b24-smgl-paths.patch 2011-12-06 21:32:43.033424397 -0600 @@ -0,0 +1,118 @@ +diff -urN openjdk/corba/make/common/shared/Defs-utils.gmk openjdk-mod/corba/make/common/shared/Defs-utils.gmk +--- openjdk/corba/make/common/shared/Defs-utils.gmk 2011-11-14 16:05:59.000000000 -0600 ++++ openjdk-mod/corba/make/common/shared/Defs-utils.gmk 2011-12-06 21:13:30.991437225 -0600 +@@ -85,15 +85,15 @@ + DIFF = $(UTILS_USR_BIN_PATH)diff + DIRNAME = $(UTILS_USR_BIN_PATH)dirname + ECHO = $(UTILS_COMMAND_PATH)echo +-EGREP = $(UTILS_COMMAND_PATH)egrep ++EGREP = $(UTILS_USR_BIN_PATH)egrep + 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 +-HEAD = $(UTILS_USR_BIN_PATH)head ++HEAD = $(UTILS_COMMAND_PATH)head + ID = $(UTILS_COMMAND_PATH)id + ISAINFO = $(UTILS_COMMAND_PATH)isainfo + KSH = $(UTILS_COMMAND_PATH)ksh +@@ -122,9 +122,9 @@ + SHOWREV = $(UTILS_USR_BIN_PATH)showrev + SORT = $(UTILS_COMMAND_PATH)sort + STRIP = $(UTILS_CCS_BIN_PATH)strip +-TAIL = $(UTILS_USR_BIN_PATH)tail ++TAIL = $(UTILS_COMMAND_PATH)tail + TAR = $(UTILS_COMMAND_PATH)tar +-TEST = $(UTILS_USR_BIN_PATH)test ++TEST = $(UTILS_COMMAND_PATH)test + TOUCH = $(UTILS_COMMAND_PATH)touch + TR = $(UTILS_USR_BIN_PATH)tr + TRUE = $(UTILS_COMMAND_PATH)true +@@ -132,7 +132,7 @@ + UNIQ = $(UTILS_USR_BIN_PATH)uniq + UNZIP = $(UTILS_USR_BIN_PATH)unzip + UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx +-WC = $(UTILS_USR_BIN_PATH)wc ++WC = $(UTILS_COMMAND_PATH)wc + WHICH = $(UTILS_USR_BIN_PATH)which + YACC = $(UTILS_CCS_BIN_PATH)yacc + ZIPEXE = $(UTILS_DEVTOOL_PATH)zip +@@ -176,7 +176,7 @@ + # others have it in /usr/bin. + SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \ + $(wildcard $(UTILS_USR_BIN_PATH)sort)) +- NAWK = $(USRBIN_PATH)gawk ++ NAWK = $(UNIXCOMMAND_PATH)gawk + # Intrinsic unix command, with backslash-escaped character interpretation + ECHO = /bin/echo -e + # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not) +diff -urN openjdk/hotspot/make/linux/makefiles/sa.make openjdk-mod/hotspot/make/linux/makefiles/sa.make +--- openjdk/hotspot/make/linux/makefiles/sa.make 2011-11-14 16:07:29.000000000 -0600 ++++ openjdk-mod/hotspot/make/linux/makefiles/sa.make 2011-12-06 21:15:49.018435744 -0600 +@@ -45,8 +45,8 @@ + + # gnumake 3.78.1 does not accept the *s that + # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them +-AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1)) +-AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2)) ++AGENT_FILES1 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1)) ++AGENT_FILES2 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2)) + + AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list + AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list +diff -urN openjdk/jdk/make/common/shared/Defs-utils.gmk openjdk-mod/jdk/make/common/shared/Defs-utils.gmk +--- openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-11-14 16:11:40.000000000 -0600 ++++ openjdk-mod/jdk/make/common/shared/Defs-utils.gmk 2011-12-06 21:15:15.611436158 -0600 +@@ -98,15 +98,15 @@ + DIFF = $(UTILS_USR_BIN_PATH)diff + DIRNAME = $(UTILS_USR_BIN_PATH)dirname + ECHO = $(UTILS_COMMAND_PATH)echo +-EGREP = $(UTILS_COMMAND_PATH)egrep ++EGREP = $(UTILS_USR_BIN_PATH)egrep + 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 +-HEAD = $(UTILS_USR_BIN_PATH)head ++HEAD = $(UTILS_COMMAND_PATH)head + ID = $(UTILS_COMMAND_PATH)id + ISAINFO = $(UTILS_COMMAND_PATH)isainfo + KSH = $(UTILS_COMMAND_PATH)ksh +@@ -134,9 +134,9 @@ + SHOWREV = $(UTILS_USR_BIN_PATH)showrev + SORT = $(UTILS_COMMAND_PATH)sort + STRIP = $(UTILS_CCS_BIN_PATH)strip +-TAIL = $(UTILS_USR_BIN_PATH)tail ++TAIL = $(UTILS_COMMAND_PATH)tail + TAR = $(UTILS_COMMAND_PATH)tar +-TEST = $(UTILS_USR_BIN_PATH)test ++TEST = $(UTILS_COMMAND_PATH)test + TOUCH = $(UTILS_COMMAND_PATH)touch + TR = $(UTILS_USR_BIN_PATH)tr + TRUE = $(UTILS_COMMAND_PATH)true +@@ -144,7 +144,7 @@ + UNIQ = $(UTILS_USR_BIN_PATH)uniq + UNZIP = $(UTILS_USR_BIN_PATH)unzip + UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx +-WC = $(UTILS_USR_BIN_PATH)wc ++WC = $(UTILS_COMMAND_PATH)wc + WHICH = $(UTILS_USR_BIN_PATH)which + YACC = $(UTILS_CCS_BIN_PATH)yacc + ZIPEXE = $(UTILS_DEVTOOL_PATH)zip +@@ -178,7 +178,7 @@ + BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \ + $(wildcard $(UTILS_USR_BIN_PATH)basename)) + +- NAWK = $(USRBIN_PATH)gawk ++ NAWK = $(UNIXCOMMAND_PATH)gawk + # Intrinsic unix command, with backslash-escaped character interpretation + ECHO = /bin/echo -e + # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)