Mercurial > hg > release > icedtea7-2.0
view patches/linker-libs-order.patch @ 2445:7ca2cb0df928
Bump to b143.
2011-06-24 Andrew John Hughes <ahughes@redhat.com>
* patches/rmi_amd64.patch:
Removed, upsteam (OpenJDK).
* patches/testenv.patch:
Removed, upstream (IcedTea forest).
* Makefile.am:
(OPENJDK_VERSION): Bumped to b143.
(CORBA_CHANGESET): Updated.
(HOTSPOT_CHANGESET): Likewise.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(HOTSPOT_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
(JAXWS_DROP_ZIP): Likewise.
(JAXWS_DROP_SHA256SUM): Likewise.
(JAXP_DROP_ZIP): Likewise.
(JAXP_DROP_SHA256SUM): Likewise.
(ICEDTEA_PATCHES): Drop rmi_amd64 and testenv patch.
* generated/sun/nio/ch/SocketOptionRegistry.java:
Use version from latest build.
* patches/boot/ecj-autoboxing.patch,
* patches/boot/ecj-diamond.patch,
* patches/boot/ecj-multicatch.patch,
* patches/boot/ecj-trywithresources.patch:
Extended with new cases introduced since b136.
* patches/boot/jar.patch:
Recreated against b143.
* patches/boot/revert-6941137.patch:
Updated for b143.
* patches/boot/symbols.patch: Likewise.
* patches/libraries.patch: Likewise.
* patches/linker-libs-order.patch: Likewise.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Fri, 24 Jun 2011 19:07:40 +0100 |
| parents | 1d110524d034 |
| children |
line wrap: on
line source
diff -Nru 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 2011-06-13 15:19:20.000000000 +0100 +++ openjdk/jdk/make/com/sun/java/pack/Makefile 2011-06-13 15:21:25.281602536 +0100 @@ -70,12 +70,12 @@ $(ZIPOBJDIR)/inftrees.$(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 @@ -92,12 +92,11 @@ RES = $(OBJDIR)/$(PGRM).res 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 @@ -150,7 +149,7 @@ $(prep-target) $(RM) $(TEMPDIR)/mapfile-vers $(CP) mapfile-vers-unpack200 $(TEMPDIR)/mapfile-vers - $(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) ifdef MT $(MT) /manifest $(OBJDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1 endif diff -Nru openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile openjdk/jdk/make/javax/sound/jsoundalsa/Makefile --- openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile 2011-06-11 00:38:06.000000000 +0100 +++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile 2011-06-13 15:20:50.441058241 +0100 @@ -65,7 +65,7 @@ $(MIDIFILES_export) \ $(PORTFILES_export) -LDFLAGS += -lasound +OTHER_LDLIBS += -lasound CPPFLAGS += \ -DUSE_DAUDIO=TRUE \