FYI: Fix PR632: patches/security/20110215/6878713.patch breaks shark zero build

[Dr Andrew John Hughes]

On 22:28 Wed 16 Feb     , Mark Wielaard wrote:
> Hi,
> 
> As noticed by the autobuilders and as discussed in
> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=632 one of the new
> security patches breaks the shark build since llvm-config might add a
> -D__STDC_LIMIT_MACROS. The following patch fixes it:
> 
> 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.
> 
> Committed and pushed,
> 
> Mark

Did you test this with both versions of HotSpot?

> diff -r 58276c6748af -r 3f247fe29393 Makefile.am
> --- a/Makefile.am	Wed Feb 16 20:22:31 2011 +0000
> +++ b/Makefile.am	Wed Feb 16 22:23:50 2011 +0100
> @@ -186,6 +186,7 @@
>  
>  ICEDTEA_PATCHES = \
>  	$(SECURITY_PATCHES) \
> +	patches/icedtea-stdc-limit-macros.patch \
>  	patches/openjdk/4993545-nativeinlightfixer.patch \
>  	patches/openjdk/6637796-set_bounds.patch \
>  	patches/openjdk/6607660-treelock.patch \
> diff -r 58276c6748af -r 3f247fe29393 NEWS
> --- a/NEWS	Wed Feb 16 20:22:31 2011 +0000
> +++ b/NEWS	Wed Feb 16 22:23:50 2011 +0100
> @@ -418,6 +418,7 @@
>    - S7015232: missing copyright header in CheckZOrderChange.java
>    - S7017581: missing copyright header in test/sun/java2d/pipe/RegionOps.java
>    - S6896068: SunGraphics2D exposes a reference to itself while non fully initialised.
> +  - PR632: patches/security/20110215/6878713.patch breaks shark zero build
>  * Bug fixes
>    - RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors
>    - PR616, PR99: Don't statically link libstdc++ or libgcc
> diff -r 58276c6748af -r 3f247fe29393 patches/icedtea-stdc-limit-macros.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/icedtea-stdc-limit-macros.patch	Wed Feb 16 22:23:50 2011 +0100
> @@ -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>


-- 
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