Author: dj Date: 2011-02-19 13:23:09 -0700 (Sat, 19 Feb 2011) New Revision: 2284
Added: trunk/icedtea6/icedtea6-1.9.7-fixed_paths-1.patch Removed: trunk/icedtea6/icedtea6-1.9.7-fixed-paths-1.patch Log: Fixed name of icedtea6-1.9.7-fixed_paths-1.patch. Deleted: trunk/icedtea6/icedtea6-1.9.7-fixed-paths-1.patch =================================================================== --- trunk/icedtea6/icedtea6-1.9.7-fixed-paths-1.patch 2011-02-16 05:35:06 UTC (rev 2283) +++ trunk/icedtea6/icedtea6-1.9.7-fixed-paths-1.patch 2011-02-19 20:23:09 UTC (rev 2284) @@ -1,69 +0,0 @@ -diff -Naur icedtea6-1.9.7-orig/Makefile.am icedtea6-1.9.7/Makefile.am ---- icedtea6-1.9.7-orig/Makefile.am 2011-02-15 23:32:10.000000000 -0600 -+++ icedtea6-1.9.7/Makefile.am 2011-02-15 23:33:37.000000000 -0600 -@@ -321,6 +321,7 @@ - patches/openjdk/6622432-bigdecimal_performance.patch \ - patches/openjdk/6850606-bigdecimal_regression.patch \ - patches/openjdk/6876282-bigdecimal_divide.patch \ -+ patches/openjdk-lfs-paths.patch \ - patches/f14-fonts.patch \ - patches/applet_hole.patch \ - patches/openjdk/7002666-eclipse_cdt_oops_crash.patch \ -diff -Naur icedtea6-1.9.7-orig/patches/openjdk-lfs-paths.patch icedtea6-1.9.7/patches/openjdk-lfs-paths.patch ---- icedtea6-1.9.7-orig/patches/openjdk-lfs-paths.patch 1969-12-31 18:00:00.000000000 -0600 -+++ icedtea6-1.9.7/patches/openjdk-lfs-paths.patch 2011-02-15 23:32:32.000000000 -0600 -@@ -0,0 +1,54 @@ -+diff -Nru openjdk.orig/corba/make/common/shared/Defs-utils.gmk openjdk/corba/make/common/shared/Defs-utils.gmk -+--- openjdk.orig/corba/make/common/shared/Defs-utils.gmk 2010-06-21 16:11:20.000000000 -0500 -++++ openjdk/corba/make/common/shared/Defs-utils.gmk 2011-01-11 01:30:48.000000000 -0600 -+@@ -88,12 +88,12 @@ -+ EGREP = $(UTILS_COMMAND_PATH)egrep -+ EXPR = $(UTILS_USR_BIN_PATH)expr -+ FILE = $(UTILS_USR_BIN_PATH)file -+-FIND = $(UTILS_USR_BIN_PATH)find -++FIND = $(UTILS_COMMAND_PATH)find -+ FMT = $(UTILS_COMMAND_PATH)fmt -+ GDB = $(UTILS_USR_BIN_PATH)gdb -+ GREP = $(UTILS_COMMAND_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 -+@@ -125,7 +125,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 -+diff -Nru openjdk.orig/jdk/make/common/shared/Defs-utils.gmk openjdk/jdk/make/common/shared/Defs-utils.gmk -+--- openjdk.orig//jdk/make/common/shared/Defs-utils.gmk 2010-06-21 16:15:08.000000000 -0500 -++++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-01-11 01:32:07.000000000 -0600 -+@@ -101,12 +101,12 @@ -+ EGREP = $(UTILS_COMMAND_PATH)egrep -+ EXPR = $(UTILS_USR_BIN_PATH)expr -+ FILE = $(UTILS_USR_BIN_PATH)file -+-FIND = $(UTILS_USR_BIN_PATH)find -++FIND = $(UTILS_COMMAND_PATH)find -+ FMT = $(UTILS_COMMAND_PATH)fmt -+ GDB = $(UTILS_USR_BIN_PATH)gdb -+ GREP = $(UTILS_COMMAND_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 -+@@ -137,7 +137,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 Copied: trunk/icedtea6/icedtea6-1.9.7-fixed_paths-1.patch (from rev 2283, trunk/icedtea6/icedtea6-1.9.7-fixed-paths-1.patch) =================================================================== --- trunk/icedtea6/icedtea6-1.9.7-fixed_paths-1.patch (rev 0) +++ trunk/icedtea6/icedtea6-1.9.7-fixed_paths-1.patch 2011-02-19 20:23:09 UTC (rev 2284) @@ -0,0 +1,69 @@ +diff -Naur icedtea6-1.9.7-orig/Makefile.am icedtea6-1.9.7/Makefile.am +--- icedtea6-1.9.7-orig/Makefile.am 2011-02-15 23:32:10.000000000 -0600 ++++ icedtea6-1.9.7/Makefile.am 2011-02-15 23:33:37.000000000 -0600 +@@ -321,6 +321,7 @@ + patches/openjdk/6622432-bigdecimal_performance.patch \ + patches/openjdk/6850606-bigdecimal_regression.patch \ + patches/openjdk/6876282-bigdecimal_divide.patch \ ++ patches/openjdk-lfs-paths.patch \ + patches/f14-fonts.patch \ + patches/applet_hole.patch \ + patches/openjdk/7002666-eclipse_cdt_oops_crash.patch \ +diff -Naur icedtea6-1.9.7-orig/patches/openjdk-lfs-paths.patch icedtea6-1.9.7/patches/openjdk-lfs-paths.patch +--- icedtea6-1.9.7-orig/patches/openjdk-lfs-paths.patch 1969-12-31 18:00:00.000000000 -0600 ++++ icedtea6-1.9.7/patches/openjdk-lfs-paths.patch 2011-02-15 23:32:32.000000000 -0600 +@@ -0,0 +1,54 @@ ++diff -Nru openjdk.orig/corba/make/common/shared/Defs-utils.gmk openjdk/corba/make/common/shared/Defs-utils.gmk ++--- openjdk.orig/corba/make/common/shared/Defs-utils.gmk 2010-06-21 16:11:20.000000000 -0500 +++++ openjdk/corba/make/common/shared/Defs-utils.gmk 2011-01-11 01:30:48.000000000 -0600 ++@@ -88,12 +88,12 @@ ++ EGREP = $(UTILS_COMMAND_PATH)egrep ++ EXPR = $(UTILS_USR_BIN_PATH)expr ++ FILE = $(UTILS_USR_BIN_PATH)file ++-FIND = $(UTILS_USR_BIN_PATH)find +++FIND = $(UTILS_COMMAND_PATH)find ++ FMT = $(UTILS_COMMAND_PATH)fmt ++ GDB = $(UTILS_USR_BIN_PATH)gdb ++ GREP = $(UTILS_COMMAND_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 ++@@ -125,7 +125,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 ++diff -Nru openjdk.orig/jdk/make/common/shared/Defs-utils.gmk openjdk/jdk/make/common/shared/Defs-utils.gmk ++--- openjdk.orig//jdk/make/common/shared/Defs-utils.gmk 2010-06-21 16:15:08.000000000 -0500 +++++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-01-11 01:32:07.000000000 -0600 ++@@ -101,12 +101,12 @@ ++ EGREP = $(UTILS_COMMAND_PATH)egrep ++ EXPR = $(UTILS_USR_BIN_PATH)expr ++ FILE = $(UTILS_USR_BIN_PATH)file ++-FIND = $(UTILS_USR_BIN_PATH)find +++FIND = $(UTILS_COMMAND_PATH)find ++ FMT = $(UTILS_COMMAND_PATH)fmt ++ GDB = $(UTILS_USR_BIN_PATH)gdb ++ GREP = $(UTILS_COMMAND_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 ++@@ -137,7 +137,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 -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
