Mercurial > hg > release > icedtea6-1.3

changeset 77:f37ba6246a75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2007-07-06 Francis Kung <fkung@redhat.com> * Makefile.am: Update for b15. * Makefile.in: Regenerated. * patches/icedtea-copy-plugs.patch: Update for b15. * patches/icedtea-debuginfo.patch: Update for b15. * patches/icedtea-buildfix.patch: New file.
author Francis Kung <fkung@redhat.com>
date Fri, 06 Jul 2007 12:52:20 -0400
parents 5574ab846c70
children 1446daca36d7
files ChangeLog Makefile.am Makefile.in patches/icedtea-buildfix.patch patches/icedtea-copy-plugs.patch patches/icedtea-debuginfo.patch patches/icedtea-gcc.patch patches/icedtea-lesstif.patch
diffstat 8 files changed, 35 insertions(+), 59 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jul 05 14:52:28 2007 -0400
+++ b/ChangeLog	Fri Jul 06 12:52:20 2007 -0400
@@ -1,3 +1,11 @@
+2007-07-06  Francis Kung  <fkung@redhat.com>
+
+	* Makefile.am: Update for b15.
+	* Makefile.in: Regenerated.
+	* patches/icedtea-copy-plugs.patch: Update for b15.
+	* patches/icedtea-debuginfo.patch: Update for b15.
+	* patches/icedtea-buildfix.patch: New file.
+
 2007-07-05  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* Makefile.am (snapshot): New target.
--- a/Makefile.am	Thu Jul 05 14:52:28 2007 -0400
+++ b/Makefile.am	Fri Jul 06 12:52:20 2007 -0400
@@ -1,6 +1,6 @@
-OPENJDK_VERSION = b14
-OPENJDK_DATE = 21_jun_2007
-OPENJDK_MD5SUM = c126a32966e4bdb6a60a5724d9447966
+OPENJDK_VERSION = b15
+OPENJDK_DATE = 05_jul_2007
+OPENJDK_MD5SUM = cd90295a8fa19036225ff14ca641dedc
 
 OPENJDK_URL = \
 	http://download.java.net/openjdk/jdk7/promoted/$(OPENJDK_VERSION)/
@@ -27,14 +27,13 @@
 
 ICEDTEA_PATCHES = \
 	patches/icedtea-copy-plugs.patch \
-	patches/icedtea-lesstif.patch \
 	patches/icedtea-version.patch \
 	patches/icedtea-text-relocations.patch \
 	patches/icedtea-graphics.patch \
-	patches/icedtea-gcc.patch \
 	patches/icedtea-debuginfo.patch \
 	patches/icedtea-java.security.patch \
 	patches/icedtea-ssl.patch \
+	patches/icedtea-buildfix.patch \
 	$(FAST_BUILD_PATCH) \
 	$(CCACHE_PATCH)
 
--- a/Makefile.in	Thu Jul 05 14:52:28 2007 -0400
+++ b/Makefile.in	Fri Jul 06 12:52:20 2007 -0400
@@ -172,9 +172,9 @@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-OPENJDK_VERSION = b14
-OPENJDK_DATE = 21_jun_2007
-OPENJDK_MD5SUM = c126a32966e4bdb6a60a5724d9447966
+OPENJDK_VERSION = b15
+OPENJDK_DATE = 05_jul_2007
+OPENJDK_MD5SUM = cd90295a8fa19036225ff14ca641dedc
 OPENJDK_URL = \
 	http://download.java.net/openjdk/jdk7/promoted/$(OPENJDK_VERSION)/
 
@@ -187,14 +187,13 @@
 @USE_ALT_OPENJDK_SRC_ZIP_TRUE@OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
 ICEDTEA_PATCHES = \
 	patches/icedtea-copy-plugs.patch \
-	patches/icedtea-lesstif.patch \
 	patches/icedtea-version.patch \
 	patches/icedtea-text-relocations.patch \
 	patches/icedtea-graphics.patch \
-	patches/icedtea-gcc.patch \
 	patches/icedtea-debuginfo.patch \
 	patches/icedtea-java.security.patch \
 	patches/icedtea-ssl.patch \
+	patches/icedtea-buildfix.patch \
 	$(FAST_BUILD_PATCH) \
 	$(CCACHE_PATCH)
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-buildfix.patch	Fri Jul 06 12:52:20 2007 -0400
@@ -0,0 +1,12 @@
+diff -urN openjdk.orig/hotspot/src/cpu/i486/vm/assembler_i486.hpp openjdk/hotspot/src/cpu/i486/vm/assembler_i486.hpp
+--- openjdk.orig/hotspot/src/cpu/i486/vm/assembler_i486.hpp	2007-07-06 09:51:47.000000000 -0400
++++ openjdk/hotspot/src/cpu/i486/vm/assembler_i486.hpp	2007-07-06 09:53:40.000000000 -0400
+@@ -158,7 +158,7 @@
+ 
+   // Easily misused constructor make them private
+ #ifndef _LP64
+-  Address::Address(address loc, RelocationHolder spec);
++  Address(address loc, RelocationHolder spec);
+ #endif // _LP64
+ 
+  public:
--- a/patches/icedtea-copy-plugs.patch	Thu Jul 05 14:52:28 2007 -0400
+++ b/patches/icedtea-copy-plugs.patch	Fri Jul 06 12:52:20 2007 -0400
@@ -1,7 +1,7 @@
 diff -urN openjdk.orig/j2se/make/common/Release.gmk openjdk/j2se/make/common/Release.gmk
 --- openjdk.orig/j2se/make/common/Release.gmk	2007-05-24 03:33:20.000000000 -0400
 +++ openjdk/j2se/make/common/Release.gmk	2007-06-22 17:06:46.000000000 -0400
-@@ -270,6 +270,7 @@
+@@ -268,6 +268,7 @@
  
  
  CLOSED_CLASSES =  \
@@ -9,7 +9,7 @@
  sun/dc \
  java/awt/color/CMMException.class \
  java/awt/color/ColorSpace.class \
-@@ -306,8 +307,6 @@
+@@ -304,8 +305,6 @@
  com/sun/jmx/snmp/SnmpDataTypeEnums.class \
  com/sun/jmx/snmp/SnmpDefinitions.class \
  com/sun/jmx/snmp/SnmpOid.class \
@@ -18,7 +18,7 @@
  com/sun/jmx/snmp/SnmpOidRecord.class \
  com/sun/jmx/snmp/SnmpOidTable.class \
  com/sun/jmx/snmp/SnmpOidTableSupport.class \
-@@ -317,17 +316,9 @@
+@@ -315,17 +314,9 @@
  com/sun/jmx/snmp/SnmpTimeticks.class \
  com/sun/jmx/snmp/SnmpVarBind.class \
  com/sun/jmx/snmp/SnmpVarBindList.class \
@@ -146,7 +146,7 @@
 diff -urN openjdk.orig/j2se/src/share/classes/java/beans/MetaData.java openjdk/j2se/src/share/classes/java/beans/MetaData.java
 --- openjdk.orig/j2se/src/share/classes/java/beans/MetaData.java	2007-05-24 03:42:31.000000000 -0400
 +++ openjdk/j2se/src/share/classes/java/beans/MetaData.java	2007-06-22 17:06:14.000000000 -0400
-@@ -1471,7 +1471,7 @@
+@@ -1478,7 +1478,7 @@
      }
  
      private static String[] getAnnotationValue(Constructor constructor) {
--- a/patches/icedtea-debuginfo.patch	Thu Jul 05 14:52:28 2007 -0400
+++ b/patches/icedtea-debuginfo.patch	Fri Jul 06 12:52:20 2007 -0400
@@ -1,6 +1,6 @@
 --- openjdk/j2se/make/common/Defs-linux.gmk~	2007-05-24 08:33:20.000000000 +0100
 +++ openjdk/j2se/make/common/Defs-linux.gmk	2007-06-21 15:32:44.000000000 +0100
-@@ -161,13 +161,7 @@
+@@ -164,13 +164,7 @@
     CFLAGS_COMMON   += $(GLOBAL_KPIC) $(GCC_WARNINGS)
  endif
  
@@ -14,7 +14,7 @@
  
  CFLAGS_OPT      = $(POPT)
  CFLAGS_DBG      = $(DEBUG_FLAG)
-@@ -242,7 +236,7 @@
+@@ -249,7 +243,7 @@
  ifeq ($(VARIANT), OPT)
    ifneq ($(NO_STRIP), true)
      # Debug 'strip -g' leaves local function Elf symbols (better stack traces)
@@ -25,7 +25,7 @@
  
 --- openjdk/j2se/make/common/Defs.gmk~	2007-05-24 08:33:20.000000000 +0100
 +++ openjdk/j2se/make/common/Defs.gmk	2007-06-21 15:26:02.000000000 +0100
-@@ -559,13 +559,10 @@
+@@ -552,13 +552,10 @@
  JAVAC_PATHFLAGS    = $(JAVAC_CLS_FLAG) $(JAVAC_SRC_FLAG) $(JAVAC_DST_FLAG)
  JAVACFLAGS_COMMON  = $(JAVAC_PATHFLAGS) $(JAVAC_ENCODINGFLAGS)
  
--- a/patches/icedtea-gcc.patch	Thu Jul 05 14:52:28 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-diff -urN openjdk.orig/hotspot/src/share/vm/includeDB_gc_parallel openjdk/hotspot/src/share/vm/includeDB_gc_parallel
---- openjdk.orig/hotspot/src/share/vm/includeDB_gc_parallel	2007-06-21 03:30:57.000000000 -0400
-+++ openjdk/hotspot/src/share/vm/includeDB_gc_parallel	2007-06-22 16:21:23.000000000 -0400
-@@ -40,12 +40,15 @@
- instanceKlass.cpp                       oop.pcgc.inline.hpp
- instanceKlass.cpp                       psPromotionManager.inline.hpp
- instanceKlass.cpp                       psScavenge.inline.hpp
-+instanceKlass.cpp                       parOopClosures.inline.hpp
- 
- instanceKlassKlass.cpp                  psPromotionManager.inline.hpp
- instanceKlassKlass.cpp                  psScavenge.inline.hpp
- 
- instanceRefKlass.cpp                    psPromotionManager.inline.hpp
-+instanceRefKlass.cpp                    oop.pcgc.inline.hpp
- instanceRefKlass.cpp                    psScavenge.inline.hpp
-+instanceRefKlass.cpp                    parOopClosures.inline.hpp
- 
- java.cpp                                concurrentMarkSweepThread.hpp
- java.cpp                                psScavenge.hpp
-@@ -77,6 +80,7 @@
- objArrayKlass.cpp                       oop.pcgc.inline.hpp
- objArrayKlass.cpp                       psPromotionManager.inline.hpp
- objArrayKlass.cpp                       psScavenge.inline.hpp
-+objArrayKlass.cpp                       parOopClosures.inline.hpp
- 
- oop.pcgc.inline.hpp                     parNewGeneration.hpp
- oop.pcgc.inline.hpp                     parallelScavengeHeap.hpp
--- a/patches/icedtea-lesstif.patch	Thu Jul 05 14:52:28 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
---- openjdk/j2se/make/common/shared/Sanity.gmk.orig	2007-06-04 21:00:49.000000000 -0400
-+++ openjdk/j2se/make/common/shared/Sanity.gmk	2007-06-04 21:00:53.000000000 -0400
-@@ -838,10 +838,10 @@
- 	fi
-     endif  
-   endif  
--	@if [ ! -r $(MOTIF_INCLUDE)/Xm/AccColorT.h ]; then \
-+	@if [ ! -r $(MOTIF_INCLUDE)/Xm/AtomMgr.h ]; then \
- 	  $(ECHO) "ERROR: You do not have access to valid Motif 2.1 header files. \n" \
- 	    "      Please check your access to (for example) \n" \
--	    "          $(MOTIF_INCLUDE)/Xm/AccColorT.h \n" \
-+	    "          $(MOTIF_INCLUDE)/Xm/AtomMgr.h \n" \
- 	    "      and/or check your value of ALT_MOTIF_DIR. \n" \
- 	    "" >> $(ERROR_FILE) ; \
- 	fi