Mercurial > hg > release > icedtea6-1.9
changeset 2346:b80005297ae5
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 | Wed, 20 Jul 2011 12:32:30 +0100 |
parents | 11e7784eb228 |
children | 5fe46e0ad4ba |
files | ChangeLog Makefile.am NEWS patches/support_linux_3.patch |
diffstat | 4 files changed, 30 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jul 19 22:04:04 2011 +0100 +++ b/ChangeLog Wed Jul 20 12:32:30 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-07-11 Andrew John Hughes <ahughes@redhat.com> PR744: Patching error
--- a/Makefile.am Tue Jul 19 22:04:04 2011 +0100 +++ b/Makefile.am Wed Jul 20 12:32:30 2011 +0100 @@ -353,7 +353,8 @@ patches/jtreg-LastErrorString.patch \ patches/shark-llvm-2.9.patch \ patches/mark_sun_toolkit_privileged_code.patch \ - patches/fonts-rhel-version.patch + patches/fonts-rhel-version.patch \ + patches/support_linux_3.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \
--- a/NEWS Tue Jul 19 22:04:04 2011 +0100 +++ b/NEWS Wed Jul 20 12:32:30 2011 +0100 @@ -12,6 +12,7 @@ * Bug Fixes - PR744: icedtea6-1.10.2 : patching error + - PR748: Icedtea6 fails to build with Linux 3.0. * Shark - PR632: patches/security/20110215/6878713.patch breaks shark zero build
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/support_linux_3.patch Wed Jul 20 12:32:30 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)) +