Mercurial > hg > icedtea6

changeset 3137:2fba937157de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sync linker-libs-order.patch with upstream. 2014-02-01 Andrew John Hughes <gnu.andrew@redhat.com> * patches/linker-libs-order.patch: Regenerate, removing upstreamed fragment.
author Andrew John Hughes <gnu.andrew@redhat.com>
date Tue, 04 Feb 2014 15:30:30 +0000
parents 8c338e95fea0
children 787402b1e556
files ChangeLog patches/linker-libs-order.patch
diffstat 2 files changed, 21 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Feb 01 15:57:33 2014 +0000
+++ b/ChangeLog	Tue Feb 04 15:30:30 2014 +0000
@@ -1,3 +1,8 @@
+2014-02-01  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* patches/linker-libs-order.patch:
+	Regenerate, removing upstreamed fragment.
+
 2014-02-01  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	* Makefile.am:
--- a/patches/linker-libs-order.patch	Sat Feb 01 15:57:33 2014 +0000
+++ b/patches/linker-libs-order.patch	Tue Feb 04 15:30:30 2014 +0000
@@ -1,7 +1,19 @@
-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 @@
+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	2013-08-21 20:32:57.128216515 +0100
++++ openjdk/jdk/make/com/sun/java/pack/Makefile	2014-02-01 15:58:10.921834941 +0000
+@@ -144,7 +144,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)
+ 
+ 
+diff -Nru openjdk.orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk
+--- openjdk.orig/jdk/make/common/shared/Sanity.gmk	2014-02-01 15:43:22.344232267 +0000
++++ openjdk/jdk/make/common/shared/Sanity.gmk	2014-02-01 15:58:10.921834941 +0000
+@@ -1344,7 +1344,7 @@
  ifdef ALSA_VERSION_CHECK
  $(ALSA_VERSION_CHECK): $(ALSA_VERSION_CHECK).c
  	@$(prep-target)
@@ -10,27 +22,3 @@
  
  $(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
-@@ -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)
- 
-