changeset in /hg/icedtea: 2008-02-26 Lillian Angel <langel at red...
Lillian Angel
langel at redhat.com
Tue Feb 26 09:52:31 PST 2008
changeset 39944d6c0153 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=39944d6c0153
description:
2008-02-26 Lillian Angel <langel at redhat.com>
* Makefile.am
(FREETYPE2_INC_DIR): Removed.
(FREETYPE2_HEADERS): New var.
(FT2_LIB): New var.
(ICEDTEA_PATCHES): Added icedtea-freetype.patch.
* patches/icedtea-freetype.patch: New file.
* Makefile.in: Regenerated.
diffstat:
4 files changed, 66 insertions(+), 10 deletions(-)
ChangeLog | 10 ++++++++++
Makefile.am | 14 +++++++++-----
Makefile.in | 13 ++++++++-----
patches/icedtea-freetype.patch | 39 +++++++++++++++++++++++++++++++++++++++
diffs (164 lines):
diff -r 98574f83a88e -r 39944d6c0153 ChangeLog
--- a/ChangeLog Tue Feb 26 09:15:35 2008 -0500
+++ b/ChangeLog Tue Feb 26 12:42:43 2008 -0500
@@ -1,3 +1,13 @@ 2008-02-26 Lillian Angel <langel at redha
+2008-02-26 Lillian Angel <langel at redhat.com>
+
+ * Makefile.am
+ (FREETYPE2_INC_DIR): Removed.
+ (FREETYPE2_HEADERS): New var.
+ (FT2_LIB): New var.
+ (ICEDTEA_PATCHES): Added icedtea-freetype.patch.
+ * patches/icedtea-freetype.patch: New file.
+ * Makefile.in: Regenerated.
+
2008-02-26 Lillian Angel <langel at redhat.com>
* patches/icedtea-libraries.patch: Fixed dlopen calls. No longer
diff -r 98574f83a88e -r 39944d6c0153 Makefile.am
--- a/Makefile.am Tue Feb 26 09:15:35 2008 -0500
+++ b/Makefile.am Tue Feb 26 12:42:43 2008 -0500
@@ -55,7 +55,7 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC
gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports \
tools patches/icedtea-gcc-4.3.patch patches/icedtea-always-zero.patch \
patches/icedtea-plugin.patch patches/icedtea-liveconnect.patch \
- IcedTeaPlugin.cc
+ IcedTeaPlugin.cc patches/icedtea-freetype.patch
# OpenJDK build environment.
LINUX_DIR = linux-$(BUILD_ARCH_DIR)
@@ -75,6 +75,7 @@ else
else
ICEDTEA_CORE_BUILD =
endif
+
ICEDTEA_ENV = \
"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" \
@@ -94,10 +95,11 @@ ICEDTEA_ENV = \
"ENDORSED=-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
"CLASSPATH=" \
"LD_LIBRARY_PATH=" \
- "FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" \
"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
- "LIBFFI_LIBS=$(LIBFFI_LIBS)"
+ "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+ "FT2_LIB=$(FREETYPE2_LIBS)"
env:
@echo 'unset JAVA_HOME'
@@ -133,10 +135,11 @@ ICEDTEA_ENV_ECJ = \
"CLASSPATH=" \
"LD_LIBRARY_PATH=" \
"GENSRCDIR=$(abs_top_srcdir)/generated" \
- "FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" \
"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
- "LIBFFI_LIBS=$(LIBFFI_LIBS)"
+ "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+ "FT2_LIB=$(FREETYPE2_LIBS)"
env-ecj:
@echo 'unset JAVA_HOME'
@@ -273,6 +276,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-generated.patch \
patches/icedtea-lib64.patch \
patches/icedtea-zero.patch \
+ patches/icedtea-freetype.patch \
$(GCC_PATCH) \
$(FAST_BUILD_PATCH) \
$(ZERO_BUILD_PATCH) \
diff -r 98574f83a88e -r 39944d6c0153 Makefile.in
--- a/Makefile.in Tue Feb 26 09:15:35 2008 -0500
+++ b/Makefile.in Tue Feb 26 12:42:43 2008 -0500
@@ -226,7 +226,7 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC
gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports \
tools patches/icedtea-gcc-4.3.patch patches/icedtea-always-zero.patch \
patches/icedtea-plugin.patch patches/icedtea-liveconnect.patch \
- IcedTeaPlugin.cc
+ IcedTeaPlugin.cc patches/icedtea-freetype.patch
# OpenJDK build environment.
@@ -268,10 +268,11 @@ ICEDTEA_ENV = \
"ENDORSED=-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
"CLASSPATH=" \
"LD_LIBRARY_PATH=" \
- "FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" \
"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
- "LIBFFI_LIBS=$(LIBFFI_LIBS)"
+ "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+ "FT2_LIB=$(FREETYPE2_LIBS)"
# OpenJDK ecj build environment.
@@ -306,10 +307,11 @@ ICEDTEA_ENV_ECJ = \
"CLASSPATH=" \
"LD_LIBRARY_PATH=" \
"GENSRCDIR=$(abs_top_srcdir)/generated" \
- "FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" \
"ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
- "LIBFFI_LIBS=$(LIBFFI_LIBS)"
+ "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+ "FT2_LIB=$(FREETYPE2_LIBS)"
# OpenJDK Source Preparation Targets
@@ -371,6 +373,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-generated.patch \
patches/icedtea-lib64.patch \
patches/icedtea-zero.patch \
+ patches/icedtea-freetype.patch \
$(GCC_PATCH) \
$(FAST_BUILD_PATCH) \
$(ZERO_BUILD_PATCH) \
diff -r 98574f83a88e -r 39944d6c0153 patches/icedtea-freetype.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-freetype.patch Tue Feb 26 12:42:43 2008 -0500
@@ -0,0 +1,39 @@
+--- 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
+@@ -54,7 +54,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
+@@ -225,7 +225,7 @@
+ ifeq ($(PLATFORM), windows)
+ FREETYPE_LIB = $(FREETYPE_LIB_PATH)/freetype.lib
+ else
+- FREETYPE_LIB = -L$(FREETYPE_LIB_PATH) -lfreetype
++ FREETYPE_LIB = -L$(FREETYPE_LIB_PATH) $(FT2_LIB)
+ 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 @@
+ CFLAGS += -DHEADLESS
+ CXXFLAGS += -DHEADLESS
+
++FREETYPE_HEADERS=$(shell $(ECHO) \"$(FREETYPE2_HEADERS)\" | grep -o ^.*[a\-z])
++
+ ifndef OPENJDK
+ CPPFLAGS += -I$(CLOSED_SRC)/share/native/$(PKGDIR)/t2k
+ else
+- CPPFLAGS += -I$(FREETYPE_HEADERS_PATH) -I$(FREETYPE_HEADERS_PATH)/freetype2
++ CPPFLAGS += $(FREETYPE_HEADERS) $(FREETYPE_HEADERS)/freetype2 \
++ -I$(FREETYPE_HEADERS_PATH) -I$(FREETYPE_HEADERS_PATH)/freetype2
+ OTHER_LDLIBS += $(FREETYPE_LIB)
+ endif
+
More information about the distro-pkg-dev
mailing list