changeset in /hg/icedtea: Update icedtea-headers patch for b26.

[gnu_andrew at member.fsf.org]

changeset 37daefcd1e86 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=37daefcd1e86
description:
	Update icedtea-headers patch for b26.

diffstat:

2 files changed, 31 insertions(+), 22 deletions(-)
ChangeLog                     |    5 ++++
patches/icedtea-headers.patch |   48 ++++++++++++++++++++++-------------------

diffs (88 lines):

diff -r b781c21cad40 -r 37daefcd1e86 ChangeLog
--- a/ChangeLog	Fri May 23 20:45:34 2008 +0100
+++ b/ChangeLog	Fri May 23 21:30:20 2008 +0100
@@ -1,3 +1,8 @@ 2008-05-23  Andrew John Hughes  <gnu_and
+2008-05-23  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* patches/icedtea-headers.patch: Updated
+	for OpenJDK b26.
+	
 2008-05-23  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* patches/openjdk-color.patch: Add
diff -r b781c21cad40 -r 37daefcd1e86 patches/icedtea-headers.patch
--- a/patches/icedtea-headers.patch	Fri May 23 20:45:34 2008 +0100
+++ b/patches/icedtea-headers.patch	Fri May 23 21:30:20 2008 +0100
@@ -1,6 +1,7 @@
---- oldopenjdk/hotspot/build/linux/makefiles/jvmti.make	2008-02-12 04:14:13.000000000 -0500
-+++ openjdk/hotspot/build/linux/makefiles/jvmti.make	2008-02-26 11:34:28.000000000 -0500
-@@ -57,7 +57,7 @@
+diff -Nru openjdk.orig/hotspot/build/linux/makefiles/jvmti.make openjdk/hotspot/build/linux/makefiles/jvmti.make
+--- openjdk.orig/hotspot/build/linux/makefiles/jvmti.make	2008-05-23 20:51:14.000000000 +0100
++++ openjdk/hotspot/build/linux/makefiles/jvmti.make	2008-05-23 20:54:13.000000000 +0100
+@@ -59,7 +59,7 @@
  
  JvmtiGeneratedFiles = $(JvmtiGeneratedNames:%=$(JvmtiOutDir)/%)
  
@@ -9,20 +10,10 @@
  
  .PHONY: all jvmtidocs clean cleanall
  
---- openjdkold/jdk/make/tools/freetypecheck/Makefile	2008-01-04 18:20:30.000000000 -0500
-+++ openjdk/jdk/make/tools/freetypecheck/Makefile	2008-02-26 11:21:34.000000000 -0500
-@@ -61,7 +61,7 @@
-   ifeq ($(PLATFORM), solaris)
-     FT_OPTIONS += -R $(FT_LIB) -lfreetype
-   else #linux
--      FT_OPTIONS += -Wl,-rpath -Wl,$(FT_LIB) -lfreetype
-+      FT_OPTIONS += -Wl,-rpath -Wl,$(FT_LIB) $(FT2_LIB)
-   endif
- endif
- 
---- openjdkold/jdk/make/common/Defs.gmk	2008-01-04 18:20:29.000000000 -0500
-+++ openjdk/jdk/make/common/Defs.gmk	2008-02-26 11:21:49.000000000 -0500
-@@ -237,7 +237,7 @@
+diff -Nru openjdk.orig/jdk/make/common/Defs.gmk openjdk/jdk/make/common/Defs.gmk
+--- openjdk.orig/jdk/make/common/Defs.gmk	2008-05-23 20:51:33.000000000 +0100
++++ openjdk/jdk/make/common/Defs.gmk	2008-05-23 20:58:12.000000000 +0100
+@@ -219,7 +219,7 @@
    ifeq ($(PLATFORM), windows)
      FREETYPE_LIB = $(FREETYPE_LIB_PATH)/freetype.lib
    else
@@ -31,14 +22,15 @@
    endif
  
    ifdef ALT_FREETYPE_HEADERS_PATH
---- oldopenjdk/jdk/make/sun/font/Makefile	2008-01-04 18:20:30.000000000 -0500
-+++ openjdk/jdk/make/sun/font/Makefile	2008-02-26 12:12:54.000000000 -0500
-@@ -161,10 +161,13 @@
+diff -Nru openjdk.orig/jdk/make/sun/font/Makefile openjdk/jdk/make/sun/font/Makefile
+--- openjdk.orig/jdk/make/sun/font/Makefile	2008-05-23 20:51:44.000000000 +0100
++++ openjdk/jdk/make/sun/font/Makefile	2008-05-23 20:56:56.000000000 +0100
+@@ -160,11 +160,13 @@
+ #
  CFLAGS       += -DHEADLESS
  CXXFLAGS     += -DHEADLESS
++FREETYPE_HEADERS=$(shell $(ECHO) \"$(FREETYPE2_HEADERS)\" | grep -o .I.*[a\-z])
  
-+FREETYPE_HEADERS=$(shell $(ECHO) \"$(FREETYPE2_HEADERS)\" | grep -o .I.*[a\-z])
-+
  ifndef OPENJDK
    CPPFLAGS += -I$(CLOSED_SRC)/share/native/$(PKGDIR)/t2k
  else
@@ -48,3 +40,15 @@
    OTHER_LDLIBS += $(FREETYPE_LIB)
  endif
  
+diff -Nru openjdk.orig/jdk/make/tools/freetypecheck/Makefile openjdk/jdk/make/tools/freetypecheck/Makefile
+--- openjdk.orig/jdk/make/tools/freetypecheck/Makefile	2008-05-23 20:51:57.000000000 +0100
++++ openjdk/jdk/make/tools/freetypecheck/Makefile	2008-05-23 20:54:53.000000000 +0100
+@@ -45,7 +45,7 @@
+   ifeq ($(PLATFORM), solaris)
+     FT_LD_OPTIONS += -R $(FREETYPE_LIB_PATH) -lfreetype
+   else #linux
+-      FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH) -lfreetype
++      FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH) $(FT2_LIB)
+   endif
+ endif
+ FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)