changeset 835cdb193847 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=835cdb193847
description:
2008-11-03 Nix <nix at esperi.org.uk>
Omair Majid <omajid at redhat.com>
* Makefile.am (ICEDTEA_PATCHES): Added icedtea-linker-libs-order.patch.
* patches/icedtea-linker-libs-order.patch: Fixes icedtea bug#237.
diffstat:
3 files changed, 74 insertions(+), 1 deletion(-)
ChangeLog | 6 ++
Makefile.am | 3 -
patches/icedtea-linker-libs-order.patch | 66 +++++++++++++++++++++++++++++++
diffs (96 lines):
diff -r 3120ce63433d -r 835cdb193847 ChangeLog
--- a/ChangeLog Mon Nov 03 16:55:57 2008 -0500
+++ b/ChangeLog Mon Nov 03 17:14:22 2008 -0500
@@ -1,3 +1,9 @@ 2008-11-03 Omair Majid <omajid at redhat.
+2008-11-03 Nix <nix at esperi.org.uk>
+ Omair Majid <omajid at redhat.com>
+
+ * Makefile.am (ICEDTEA_PATCHES): Added icedtea-linker-libs-order.patch.
+ * patches/icedtea-linker-libs-order.patch: Fixes icedtea bug#237.
+
2008-11-03 Omair Majid <omajid at redhat.com>
* patches/icedtea-alsa-default-device.patch: New patch. Use the ALSA
diff -r 3120ce63433d -r 835cdb193847 Makefile.am
--- a/Makefile.am Mon Nov 03 16:55:57 2008 -0500
+++ b/Makefile.am Mon Nov 03 17:14:22 2008 -0500
@@ -533,7 +533,8 @@ ICEDTEA_PATCHES = \
patches/icedtea-javac-debuginfo.patch \
patches/icedtea-xjc.patch \
patches/icedtea-renderer-crossing.patch \
- patches/icedtea-alsa-default-device.patch
+ patches/icedtea-alsa-default-device.patch \
+ patches/icedtea-linker-libs-order.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r 3120ce63433d -r 835cdb193847 patches/icedtea-linker-libs-order.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-linker-libs-order.patch Mon Nov 03 17:14:22 2008 -0500
@@ -0,0 +1,66 @@
+diff -durN openjdk-orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk
+--- openjdk-orig/jdk/make/common/shared/Sanity.gmk 2008-10-27 00:25:33.000000000 +0000
++++ openjdk/jdk/make/common/shared/Sanity.gmk 2008-10-28 21:42:16.000000000 +0000
+@@ -1397,7 +1397,7 @@
+ ifdef ALSA_VERSION_CHECK
+ $(ALSA_VERSION_CHECK): $(ALSA_VERSION_CHECK).c
+ @$(prep-target)
+- @$(CC) -lasound -o $@ $<
++ @$(CC) -o $@ $< -lasound
+
+ $(ALSA_VERSION_CHECK).c:
+ @$(prep-target)
+diff -durN openjdk-orig/jdk/make/javax/sound/jsoundalsa/Makefile openjdk/jdk/make/javax/sound/jsoundalsa/Makefile
+--- openjdk-orig/jdk/make/javax/sound/jsoundalsa/Makefile 2008-08-28 09:10:50.000000000 +0100
++++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile 2008-10-28 21:55:27.000000000 +0000
+@@ -65,7 +65,7 @@
+ $(MIDIFILES_export) \
+ $(PORTFILES_export)
+
+-LDFLAGS += -lasound
++OTHER_LDLIBS += -lasound
+
+ CPPFLAGS += \
+ -DUSE_DAUDIO=TRUE \
+diff -durN openjdk-orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
+--- openjdk-orig/jdk/make/com/sun/java/pack/Makefile 2008-10-27 00:25:30.000000000 +0000
++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2008-10-28 23:27:55.000000000 +0000
+@@ -75,12 +75,12 @@
+ $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
+ $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
+
+- OTHER_LDLIBS += -lz
+ else
+ OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
+- OTHER_LDLIBS += -lz $(JVMLIB)
++ OTHER_LDLIBS += $(JVMLIB)
+ endif
+
++OTHER_LDLIBS += -lz
+ CXXFLAGS_DBG += -DFULL
+ CXXFLAGS_OPT += -DPRODUCT
+ CXXFLAGS_COMMON += -DFULL
+@@ -100,12 +100,11 @@
+ COMPILER_WARNINGS_FATAL=false
+ else
+ LDOUTPUT = -o #Have a space
+- LDDFLAGS += -lz -lc
+- OTHER_LDLIBS += $(LIBCXX)
++ OTHER_LDLIBS += $(LIBCXX) -lc
+ # setup the list of libraries to link in...
+ ifeq ($(PLATFORM), linux)
+ ifeq ("$(CC_VER_MAJOR)", "3")
+- OTHER_LDLIBS += -lz -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
++ OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
+ endif
+ endif #LINUX
+ endif #PLATFORM
+@@ -142,7 +141,7 @@
+
+ $(UNPACK_EXE): $(UNPACK_EXE_FILES_o) winres
+ $(prep-target)
+- $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
++ $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(OTHER_LDLIBS) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
+ $(CP) $(TEMPDIR)/unpack200$(EXE_SUFFIX) $(UNPACK_EXE)
+
+