Mercurial > hg > fedora

changeset 45:56c9a19a2918

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added IcedTea patches.
author Lillian Angel <langel@redhat.com>
date Mon, 27 Aug 2007 15:28:18 -0400
parents 3b59ebb5243f
children 1b44a134cf15
files patches/Makefile.patch patches/jhat.patch
diffstat 2 files changed, 75 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/Makefile.patch	Mon Aug 27 15:28:18 2007 -0400
@@ -0,0 +1,36 @@
+--- amorig	2007-08-27 14:14:11.000000000 -0400
++++ icedtea-1.3/Makefile.am	2007-08-27 14:14:27.000000000 -0400
+@@ -122,15 +122,6 @@
+ 
+ download.stamp:
+ 	rm -f download.stamp
+-	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
+-	  | $(MD5SUM) --check ; \
+-	then \
+-	  if [ $(OPENJDK_SRC_ZIP) ] ; \
+-	  then \
+-            mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
+-          fi ; \
+-	  $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP_BASE) -O $(OPENJDK_SRC_ZIP); \
+-	fi
+ 	touch download.stamp
+ 
+ clean-download:
+--- inorig	2007-08-27 14:14:16.000000000 -0400
++++ icedtea-1.3/Makefile.in	2007-08-27 14:14:34.000000000 -0400
+@@ -643,15 +643,6 @@
+ 
+ download.stamp:
+ 	rm -f download.stamp
+-	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
+-	  | $(MD5SUM) --check ; \
+-	then \
+-	  if [ $(OPENJDK_SRC_ZIP) ] ; \
+-	  then \
+-            mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
+-          fi ; \
+-	  $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP_BASE) -O $(OPENJDK_SRC_ZIP); \
+-	fi
+ 	touch download.stamp
+ 
+ clean-download:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jhat.patch	Mon Aug 27 15:28:18 2007 -0400
@@ -0,0 +1,39 @@
+--- ../icedtea/openjdk-ecj/j2se/make/sun/Makefile	2007-08-24 12:47:38.000000000 -0400
++++ openjdk/j2se/make/sun/Makefile	2007-08-27 14:42:08.000000000 -0400
+@@ -40,7 +40,7 @@
+ ifndef J2RE_ONLY
+   TOOLS_SUBDIRS  = javap native2ascii serialver jps jstat jstatd
+   TOOLS_SUBDIRS += $(JSADEBUGD_SUBDIR)
+-  TOOLS_SUBDIRS += jstack jmap jinfo jconsole jrunscript jhat
++  TOOLS_SUBDIRS += jstack jmap jinfo jconsole jrunscript
+ endif
+ 
+ # Rhino/Mozilla java sources
+--- ../icedtea/openjdk/j2se/make/common/Release.gmk	2007-08-16 03:17:47.000000000 -0400
++++ openjdk/j2se/make/common/Release.gmk	2007-08-27 14:51:39.000000000 -0400
+@@ -169,7 +169,6 @@
+ 	javap.1 \
+ 	jconsole.1 \
+ 	jdb.1 \
+-	jhat.1 \
+   jinfo.1 \
+   jmap.1 \
+   jps.1 \
+@@ -352,7 +351,6 @@
+ 	com/sun/tools/example/debug/expr \
+ 	com/sun/tools/example/debug/tty  \
+ 	com/sun/tools/extcheck  \
+-	com/sun/tools/hat       \
+ 	com/sun/tools/javac     \
+ 	com/sun/tools/javadoc   \
+ 	com/sun/tools/apt       \
+@@ -462,8 +460,7 @@
+ 	wsgen$(EXE_SUFFIX) \
+ 	wsimport$(EXE_SUFFIX) \
+         schemagen$(EXE_SUFFIX) \
+-	jsadebugd$(EXE_SUFFIX) \
+-	jhat$(EXE_SUFFIX)
++	jsadebugd$(EXE_SUFFIX)
+ 
+ # The following get removed from the JRE after the bulk-copy of LIBDIR...
+ NOTJRELIBS = tools.jar \