/hg/release/icedtea6-1.8: PR632: 6878713.patch breaks shark zero...

[Dr Andrew John Hughes]

On 12:30 Fri 25 Mar     , doko at icedtea.classpath.org wrote:
> changeset 015d29e3b82a in /hg/release/icedtea6-1.8
> details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=015d29e3b82a
> author: doko at ubuntu.com
> date: Fri Mar 25 13:25:46 2011 +0100
> 
> 	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.
> 
> 
> diffstat:
> 
>  ChangeLog                               |  10 ++++++++++
>  Makefile.am                             |   1 +
>  NEWS                                    |   1 +
>  patches/icedtea-stdc-limit-macros.patch |  11 +++++++++++
>  4 files changed, 23 insertions(+), 0 deletions(-)
> 
> diffs (55 lines):
> 
> diff -r d8e980ec37e7 -r 015d29e3b82a ChangeLog
> --- a/ChangeLog	Thu Feb 24 16:28:01 2011 +0100
> +++ b/ChangeLog	Fri Mar 25 13:25:46 2011 +0100
> @@ -1,3 +1,13 @@
> +2011-03-25  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.
> +
>  2011-02-24  Pavel Tisnovsky  <ptisnovs at redhat.com>
>  
>  	* Makefile.am: Add patch.
> diff -r d8e980ec37e7 -r 015d29e3b82a Makefile.am
> --- a/Makefile.am	Thu Feb 24 16:28:01 2011 +0100
> +++ b/Makefile.am	Fri Mar 25 13:25:46 2011 +0100
> @@ -263,6 +263,7 @@
>  
>  ICEDTEA_PATCHES = \
>  	$(SECURITY_PATCHES) \
> +	patches/icedtea-stdc-limit-macros.patch \
>  	patches/zero/6890308.patch \
>  	patches/zero/6891677.patch \
>  	patches/zero/6896043.patch \
> diff -r d8e980ec37e7 -r 015d29e3b82a NEWS
> --- a/NEWS	Thu Feb 24 16:28:01 2011 +0100
> +++ b/NEWS	Fri Mar 25 13:25:46 2011 +0100
> @@ -13,6 +13,7 @@
>  * Backports
>    - S6675802: Regression: heavyweight popups cause SecurityExceptions in applets
>    - S6691503: Malicious applet can show always-on-top popup menu which has whole screen size
> +  - PR632: patches/security/20110215/6878713.patch breaks shark zero build
>  
>  New in release 1.8.7 (2011-02-15):
>  
> diff -r d8e980ec37e7 -r 015d29e3b82a patches/icedtea-stdc-limit-macros.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/icedtea-stdc-limit-macros.patch	Fri Mar 25 13:25:46 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>

Where was this reviewed?
-- 
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