Mercurial > hg > release > icedtea6-1.9

changeset 2344:1c554e7ce79e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR632: 6878713.patch breaks shark zero build 2011-07-09 Xerxes R?nby <xerxes@zafena.se> Mark Wielaard <mark@klomp.org> PR632: 6878713.patch breaks shark zero build * patches/stdc-limit-macros.patch (openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp): Only define __STDC_LIMIT_MACROS if undefined. * Makefile.am (ICEDTEA_PATCHES): Add new patch. * NEWS: Updated.
author Xerxes R?nby <xerxes@zafena.se>
date Sat, 09 Jul 2011 16:58:17 +0200
parents 78333d0b383a
children 11e7784eb228
files ChangeLog Makefile.am NEWS patches/stdc-limit-macros.patch
diffstat 4 files changed, 26 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jun 10 17:58:23 2011 +0200
+++ b/ChangeLog	Sat Jul 09 16:58:17 2011 +0200
@@ -1,3 +1,13 @@
+2011-07-09  Xerxes Rånby  <xerxes@zafena.se>
+	    Mark Wielaard  <mark@klomp.org>
+
+	PR632: 6878713.patch breaks shark zero build
+	* patches/stdc-limit-macros.patch
+	(openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp):
+	Only define __STDC_LIMIT_MACROS if undefined.
+	* Makefile.am (ICEDTEA_PATCHES): Add new patch.
+	* NEWS: Updated.
+
 2011-06-10  Pavel Tisnovsky  <ptisnovs@redhat.com>
 
 	* patches/font-rhel.patch:
--- a/Makefile.am	Fri Jun 10 17:58:23 2011 +0200
+++ b/Makefile.am	Sat Jul 09 16:58:17 2011 +0200
@@ -239,6 +239,7 @@
 
 ICEDTEA_PATCHES = \
 	$(SECURITY_PATCHES) \
+	patches/stdc-limit-macros.patch \
 	patches/icedtea-notice-safepoints.patch \
 	patches/icedtea-parisc-opt.patch \
 	patches/icedtea-lucene-crash.patch \
--- a/NEWS	Fri Jun 10 17:58:23 2011 +0200
+++ b/NEWS	Sat Jul 09 16:58:17 2011 +0200
@@ -10,6 +10,9 @@
 
 New in release 1.9.9 (20XX-XX-XX):
 
+* Shark
+  - PR632: patches/security/20110215/6878713.patch breaks shark zero build
+
 New in release 1.9.8 (2011-06-07):
 
 * Security fixes
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/stdc-limit-macros.patch	Sat Jul 09 16:58:17 2011 +0200
@@ -0,0 +1,12 @@
+--- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
+@@ -72,7 +72,9 @@
+ # endif
+
+ #ifdef LINUX
++#ifndef __STDC_LIMIT_MACROS
+ #define __STDC_LIMIT_MACROS
++#endif
+ #include <inttypes.h>
+ #include <signal.h>
+ #include <ucontext.h>