Mercurial > hg > release > icedtea6-1.10
changeset 2527:28c6f2df4627
Allow Linux 3* to pass through the HotSpot OS version filter.
2011-06-28 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am: Add new patch.
* patches/support_linux_3.patch:
Allow Linux 3* through the HotSpot OS version
filter.
* NEWS: Updated.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Thu, 07 Jul 2011 22:01:17 +0100 |
| parents | a95c47b36218 |
| children | 15caf12fc26d |
| files | ChangeLog Makefile.am NEWS patches/support_linux_3.patch |
| diffstat | 4 files changed, 32 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jun 08 18:16:37 2011 +0100 +++ b/ChangeLog Thu Jul 07 22:01:17 2011 +0100 @@ -1,3 +1,11 @@ +2011-06-28 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: Add new patch. + * patches/support_linux_3.patch: + Allow Linux 3* through the HotSpot OS version + filter. + * NEWS: Updated. + 2011-06-08 Andrew John Hughes <ahughes@redhat.com> * NEWS: Add 1.10.3.
--- a/Makefile.am Wed Jun 08 18:16:37 2011 +0100 +++ b/Makefile.am Thu Jul 07 22:01:17 2011 +0100 @@ -341,7 +341,8 @@ patches/openjdk/7031385-gcc-register-allocation-fix.patch \ patches/shark-llvm-2.9.patch \ patches/openjdk/pgram-pipe-regression.patch \ - patches/openjdk/mutter.patch + patches/openjdk/mutter.patch \ + patches/support_linux_3.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \
--- a/NEWS Wed Jun 08 18:16:37 2011 +0100 +++ b/NEWS Thu Jul 07 22:01:17 2011 +0100 @@ -11,6 +11,9 @@ New in release 1.10.3 (20XX-XX-XX): +* Bug fixes + - PR748: Icedtea6 fails to build with Linux 3.0. + New in release 1.10.2 (2011-06-07): * Security fixes
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/support_linux_3.patch Thu Jul 07 22:01:17 2011 +0100 @@ -0,0 +1,19 @@ +# HG changeset patch +# User andrew +# Date 1309217125 -3600 +# Node ID f7e8b10f51c6a622520b55df0c644fb09ec78542 +# Parent b8227c320dec384a94026fcaa650b0ebd4eef13b +Allow building HotSpot with any Linux 3 version. + +diff -r b8227c320dec -r f7e8b10f51c6 make/linux/Makefile +--- openjdk/hotspot/make/linux/Makefile Wed Jun 15 18:56:52 2011 +0100 ++++ openjdk/hotspot/make/linux/Makefile Tue Jun 28 00:25:25 2011 +0100 +@@ -230,7 +230,7 @@ + # Solaris 2.5.1, 2.6). + # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. + +-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7% ++SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% + OS_VERSION := $(shell uname -r) + EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) +