Mercurial > hg > release > icedtea7-2.6

changeset 1972:ad8209f846e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2009-08-06 Matthias Klose <doko@ubuntu.com> * Makefile.am (ICEDTEA_PATCHES): Make $(DISTRIBUTION_PATCHES) the last patches in the list.
author doko@ubuntu.com
date Thu, 06 Aug 2009 13:17:23 +0200
parents bcd06cb49945
children 2af5ec988144
files ChangeLog Makefile.am
diffstat 2 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Aug 06 12:11:42 2009 +0100
+++ b/ChangeLog	Thu Aug 06 13:17:23 2009 +0200
@@ -1,12 +1,13 @@
+2009-08-06  Matthias Klose  <doko@ubuntu.com>
+
+	* Makefile.am (ICEDTEA_PATCHES): Make $(DISTRIBUTION_PATCHES) the
+	last patches in the list.
+
 2009-08-06  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
 	Bump JDK changeset to obtain execvpe fix.
 
-2009-08-06  Matthias Klose  <doko@ubuntu.com>
-
-	* Makefile.am.orig: Remove.
-
 2009-08-05  Mark Wielaard  <mjw@redhat.com>
 
 	* patches/icedtea-systemtap.patch: Remove workaround for nmethod.cpp.
--- a/Makefile.am	Thu Aug 06 12:11:42 2009 +0100
+++ b/Makefile.am	Thu Aug 06 13:17:23 2009 +0200
@@ -2069,8 +2069,7 @@
 	patches/icedtea-jvmtiEnv.patch \
 	patches/icedtea-xml-encodinginfo.patch \
 	patches/icedtea-cc-interp-backedge.patch \
-	patches/icedtea-netx.patch \
-	$(DISTRIBUTION_PATCHES)
+	patches/icedtea-netx.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
@@ -2130,6 +2129,8 @@
 endif
 endif
 
+ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
+
 stamps/extract.stamp: stamps/download.stamp
 if OPENJDK_SRC_DIR_FOUND
 	cp -a $(OPENJDK_SRC_DIR) openjdk