RFC: icedtea6-1.9: PR632: 6878713.patch breaks shark zero build

[Dr Andrew John Hughes]

On 01:18 Thu 21 Apr     , Xerxes Rånby wrote:
> Hi team
> 
> Here are the missing review to add PR632 to the icedtea6-1.9 release branch.
> 
> Ok to push?
> 
> Cheers
> Xerxes

Does this apply fine with both HotSpots in 1.9?

I take it the other branches were done and this got missed?

> 
> # HG changeset patch
> # User Mark Wielaard <mark at klomp.org>
> # Date 1297891430 -3600
> # Node ID 3f247fe29393767e0e6692cdc7fb6551a36a5480
> # Parent  58276c6748af3665ffc8247071de1faebdaf6c05
> PR632: 6878713.patch breaks shark zero build
> 
> 2011-02-16  Xerxes Ranby  <xerxes at zafena.se>
>             Mark Wielaard  <mark at klomp.org>
> 
>         PR632: 6878713.patch breaks shark zero build
>         * patches/icedtea-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.
> 
> Index: icedtea6-1.9/Makefile.am
> ===================================================================
> --- icedtea6-1.9.orig/Makefile.am	2011-04-21 00:04:59.000000000 +0200
> +++ icedtea6-1.9/Makefile.am	2011-04-21 00:39:14.528180000 +0200
> @@ -230,6 +230,7 @@
>  
>  ICEDTEA_PATCHES = \
>  	$(SECURITY_PATCHES) \
> +	patches/icedtea-stdc-limit-macros.patch \
>  	patches/icedtea-notice-safepoints.patch \
>  	patches/icedtea-parisc-opt.patch \
>  	patches/icedtea-lucene-crash.patch \
> Index: icedtea6-1.9/NEWS
> ===================================================================
> --- icedtea6-1.9.orig/NEWS	2011-04-21 00:04:59.000000000 +0200
> +++ icedtea6-1.9/NEWS	2011-04-21 00:37:23.564180001 +0200
> @@ -18,6 +18,7 @@
>  * Plugin
>    - PR542: Plugin fails with NPE on http://www.openprocessing.org/visuals/iframe.php?visualID=2615
>  * Shark
> +  - PR632: patches/security/20110215/6878713.patch breaks shark zero build
>    - PR689: Shark fails to find LLVM 2.9 System headers during build
>  
>  New in release 1.9.7 (2011-02-15):
> Index: icedtea6-1.9/patches/icedtea-stdc-limit-macros.patch
> ===================================================================
> --- /dev/null	1970-01-01 00:00:00.000000000 +0000
> +++ icedtea6-1.9/patches/icedtea-stdc-limit-macros.patch	2011-04-21 00:34:18.900180000 +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>
> Index: icedtea6-1.9/ChangeLog
> ===================================================================
> --- icedtea6-1.9.orig/ChangeLog	2011-04-21 00:04:59.000000000 +0200
> +++ icedtea6-1.9/ChangeLog	2011-04-21 00:48:24.528180002 +0200
> @@ -1,3 +1,13 @@
> +2011-04-21  Xerxes R??nby  <xerxes at zafena.se>
> +	    Mark Wielaard <mark at klomp.org>
> +
> +	PR632: 6878713.patch breaks shark zero build
> +	* patches/icedtea-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-04-15  Pavel Tisnovsky  <ptisnovs at redhat.com>
>  
>  	* Makefile.am: Add new patch.


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37