/hg/icedtea6: Disable use of the precompiled header by setting D...

[doko at icedtea.classpath.org]

changeset fc2d2cedfcc9 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fc2d2cedfcc9
author: doko at ubuntu.com
date: Fri Oct 30 12:07:39 2009 +0100

	Disable use of the precompiled header by setting
	DISABLE_PRECOMPILED_HEADER 2009-10-22 Matthias Klose
	<doko at ubuntu.com>

	 * patches/icedtea-no-precompiled.patch: Allow disabling of
	the precompiled header setting DISABLE_PRECOMPILED_HEADER.
	        * Makefile.am (ICEDTEA_PATCHES): Apply the above.
	        * HACKING: Update.


diffstat:

4 files changed, 32 insertions(+), 21 deletions(-)
ChangeLog                            |    7 +++++
HACKING                              |    2 -
Makefile.am                          |    1 
patches/icedtea-no-precompiled.patch |   43 ++++++++++++++++++----------------

diffs (96 lines):

diff -r 65354a314022 -r fc2d2cedfcc9 ChangeLog
--- a/ChangeLog	Thu Oct 29 10:50:40 2009 +0000
+++ b/ChangeLog	Fri Oct 30 12:07:39 2009 +0100
@@ -1,3 +1,10 @@ 2009-10-29  Gary Benson  <gbenson at redhat
+2009-10-22  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/icedtea-no-precompiled.patch: Allow disabling of the
+	precompiled header setting DISABLE_PRECOMPILED_HEADER.
+	* Makefile.am (ICEDTEA_PATCHES): Apply the above.
+	* HACKING: Update.
+
 2009-10-29  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/globals_zero.hpp
diff -r 65354a314022 -r fc2d2cedfcc9 HACKING
--- a/HACKING	Thu Oct 29 10:50:40 2009 +0000
+++ b/HACKING	Fri Oct 30 12:07:39 2009 +0100
@@ -77,7 +77,7 @@ The following patches are currently appl
 * icedtea-cc-interp-jvmti.patch: Disable some JVMTI capabilities which are unsupported or do not work with the C++ interpreter.
 * icedtea-demo-swingapplet.patch: Add missing html file needed to run the demo.
 * icedtea-6791168.patch: Fix build failure with GCC-4.4 (PR 38725) and compiler warnings.
-* icedtea-no-precompiled.patch: Don't use precompiled header files in hotspot.
+* icedtea-no-precompiled.patch: Don't use precompiled header files in hotspot when DISABLE_PRECOMPILED_HEADER is set.
 * icedtea-includedb.patch: Add missing include files.
 * icedtea-awt-window-size.patch: Fix X11 window size calculation (S6721088).
 * icedtea-java2d-dasher.patch: Fix interpretation of dash array elements in BasicStroke (S6793344).
diff -r 65354a314022 -r fc2d2cedfcc9 Makefile.am
--- a/Makefile.am	Thu Oct 29 10:50:40 2009 +0000
+++ b/Makefile.am	Fri Oct 30 12:07:39 2009 +0100
@@ -689,6 +689,7 @@ ICEDTEA_PATCHES += \
 	patches/icedtea-gcc-stack-markings.patch \
 	patches/icedtea-s390-serialize.patch \
 	patches/openjdk/6879689-hotspot_warning_fix.patch \
+	patches/icedtea-no-precompiled.patch \
 	$(DISTRIBUTION_PATCHES)
 
 stamps/extract.stamp: stamps/download.stamp
diff -r 65354a314022 -r fc2d2cedfcc9 patches/icedtea-no-precompiled.patch
--- a/patches/icedtea-no-precompiled.patch	Thu Oct 29 10:50:40 2009 +0000
+++ b/patches/icedtea-no-precompiled.patch	Fri Oct 30 12:07:39 2009 +0100
@@ -1,32 +1,35 @@
---- openjdk/hotspot/make/linux/makefiles/gcc.make.orig	2009-01-04 13:51:38.000000000 +0000
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make	2009-01-04 13:53:34.000000000 +0000
-@@ -34,13 +34,6 @@
+--- openjdk/hotspot/make/linux/makefiles/gcc.make~	2009-10-30 11:54:26.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/gcc.make	2009-10-30 11:55:34.000000000 +0100
+@@ -34,13 +34,14 @@
  CC_VER_MAJOR := $(shell $(CC) -dumpversion | sed 's/egcs-//' | cut -d'.' -f1)
  CC_VER_MINOR := $(shell $(CC) -dumpversion | sed 's/egcs-//' | cut -d'.' -f2)
  
--# check for precompiled headers support
--ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 4 \) \))" "0"
--USE_PRECOMPILED_HEADER=1
--PRECOMPILED_HEADER_DIR=.
--PRECOMPILED_HEADER=$(PRECOMPILED_HEADER_DIR)/incls/_precompiled.incl.gch
--endif
++ifeq (,$(DISABLE_PRECOMPILED_HEADER))
+ # check for precompiled headers support
+ ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 4 \) \))" "0"
+ USE_PRECOMPILED_HEADER=1
+ PRECOMPILED_HEADER_DIR=.
+ PRECOMPILED_HEADER=$(PRECOMPILED_HEADER_DIR)/incls/_precompiled.incl.gch
+ endif
 -
++endif
  
  #------------------------------------------------------------------------
  # Compiler flags
---- openjdk/hotspot/make/solaris/makefiles/gcc.make.orig	2009-01-04 14:44:12.000000000 +0000
-+++ openjdk/hotspot/make/solaris/makefiles/gcc.make	2009-01-04 17:06:50.000000000 +0000
-@@ -45,13 +45,6 @@
+--- openjdk/hotspot/make/solaris/makefiles/gcc.make~	2009-10-30 11:54:26.000000000 +0100
++++ openjdk/hotspot/make/solaris/makefiles/gcc.make	2009-10-30 11:56:05.000000000 +0100
+@@ -45,12 +45,14 @@
  $(shell $(CC) -dumpversion | sed 's/egcs-//' | cut -d'.' -f2)
  
  
--# check for precompiled headers support
--ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 4 \) \))" "0"
--USE_PRECOMPILED_HEADER=1
--PRECOMPILED_HEADER_DIR=.
--PRECOMPILED_HEADER=$(PRECOMPILED_HEADER_DIR)/incls/_precompiled.incl.gch
--endif
--
++ifeq (,$(DISABLE_PRECOMPILED_HEADER))
+ # check for precompiled headers support
+ ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 4 \) \))" "0"
+ USE_PRECOMPILED_HEADER=1
+ PRECOMPILED_HEADER_DIR=.
+ PRECOMPILED_HEADER=$(PRECOMPILED_HEADER_DIR)/incls/_precompiled.incl.gch
+ endif
++endif
+ 
  
  #------------------------------------------------------------------------
- # Compiler flags