/hg/icedtea: patch doesn't apply anymore, set the env var DISABL...

[doko at icedtea.classpath.org]

changeset 48e9cd4206ad in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=48e9cd4206ad
author: doko at ubuntu.com
date: Thu Sep 09 17:56:38 2010 +0200

	patch doesn't apply anymore, set the env var
	DISABLE_PRECOMPILED_HEADER to an non-empty value instead, for not
	using the precompiled header file.

	2010-09-09 Matthias Klose <doko at ubuntu.com>

	 * patches/hotspot/default/icedtea-no-precompiled.patch:
	Remove.


diffstat:

2 files changed, 4 insertions(+), 32 deletions(-)
ChangeLog                                            |    4 ++
patches/hotspot/default/icedtea-no-precompiled.patch |   32 ------------------

diffs (47 lines):

diff -r 24c32ab62605 -r 48e9cd4206ad ChangeLog
--- a/ChangeLog	Tue Sep 07 23:34:25 2010 +0100
+++ b/ChangeLog	Thu Sep 09 17:56:38 2010 +0200
@@ -1,3 +1,7 @@ 2010-09-07  Andrew John Hughes  <ahughes
+2010-09-09  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/hotspot/default/icedtea-no-precompiled.patch: Remove.
+
 2010-09-07  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/icedtea-6977640.patch: Dropped.
diff -r 24c32ab62605 -r 48e9cd4206ad patches/hotspot/default/icedtea-no-precompiled.patch
--- a/patches/hotspot/default/icedtea-no-precompiled.patch	Tue Sep 07 23:34:25 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
---- 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 @@
- 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
--
- 
- #------------------------------------------------------------------------
- # 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 @@
- $(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
--
- 
- #------------------------------------------------------------------------
- # Compiler flags