/hg/icedtea7: 6 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Aug 23 17:57:22 PDT 2012
changeset 000df05fbd54 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=000df05fbd54
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Aug 22 21:21:57 2012 +0100
PR1095: Add configure option for -Werror
2012-08-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
(ICEDTEA_PATCHES): Add -Werror patches
from IcedTea7 HEAD. Drop ecj-opts patch
as replaced by change to javac.in.
(WERROR_STATUS): Set to true or false
depending on if ENABLE_WERROR is set or not.
(ICEDTEA_ENV): Use WERROR_STATUS to set
JAVAC_WARNINGS_FATAL & COMPILER_WARNINGS_FATAL.
* acinclude.m4:
(IT_ENABLE_WERROR): New macro to enable -Werror.
This is disabled by default.
* configure.ac: Call IT_ENABLE_WERROR.
* javac.in: Handle stripping of arguments which
take parameters, specifically -Xmaxwarns.
* patches/werror-hotspot.patch:
Allow COMPILER_WARNINGS_FATAL to turn off -Werror.
* patches/werror-jdk.patch:
Remove cases where -Werror is forced on, allowing
JAVAC_WARNINGS_FATAL and COMPILER_WARNINGS_FATAL
to work correctly throughout.
* patches/werror-langtools.patch:
Allow JAVAC_WARNINGS_FATAL=false to turn off -Werror.
* NEWS: Updated.
changeset 9f42ba0226e1 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=9f42ba0226e1
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Aug 22 23:30:06 2012 +0100
PR1137: Allow JARs to be optionally compressed by setting COMPRESS_JARS
2012-08-22 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR1137: Allow JARs to be optionally compressed by
setting COMPRESS_JARS
* Makefile.am:
(ICEDTEA_ENV): Add COMPRESS_JARS="true" if
ENABLE_JAR_COMPRESSION is set.
* NEWS: Updated.
* acinclude.m4: Add IT_ENABLE_JAR_COMPRESSION macro.
* configure.ac: Include new macro.
changeset 7c4551c5d837 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=7c4551c5d837
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Aug 22 23:40:32 2012 +0100
Update INSTALL documentation with latest options. Remove dead ones.
2012-08-22 Andrew John Hughes <gnu_andrew at member.fsf.org>
* INSTALL: Update with new options.
Remove dead --with-netbeans. Move some
to appropriate section.
* acinclude.m4:
(IT_ENABLE_JAR_COMPRESSION): Set help text
to --disable-jar-compression as default is to
enable it.
changeset acb85bf39e53 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=acb85bf39e53
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Aug 24 00:48:55 2012 +0100
PR1140: Unnecessary diz files should not be installed
2012-08-22 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR1140: Unnecessary diz files should not be installed
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch from
IcedTea7 HEAD.
* NEWS: Updated.
* patches/no_diz_files.patch: Backported
from IcedTea7 HEAD. Make sure jdk doesn't
create diz files when building with no_strip.
changeset 60c41b88775a in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=60c41b88775a
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Aug 24 01:53:07 2012 +0100
PR1138: jvisualvm.1 should not be installed in OpenJDK builds
2012-08-23 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR1138: jvisualvm.1 should not be installed in OpenJDK builds
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch from
IcedTea7 HEAD.
* NEWS: Updated.
* patches/7192804-jvisualvm.patch:
Don't install jvisualvm.1.
changeset 727519ab8096 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=727519ab8096
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Aug 24 01:53:20 2012 +0100
Added tag icedtea-2.3-branchpoint for changeset 60c41b88775a
diffstat:
.hgtags | 1 +
ChangeLog | 69 +++++++++++++++++++
INSTALL | 22 +++++-
Makefile.am | 23 +++++-
NEWS | 4 +
acinclude.m4 | 44 ++++++++++++
configure.ac | 2 +
javac.in | 11 ++-
patches/7192804-jvisualvm.patch | 31 ++++++++
patches/no_diz_files.patch | 143 ++++++++++++++++++++++++++++++++++++++++
patches/werror-hotspot.patch | 56 +++++++++++++++
patches/werror-jdk.patch | 78 +++++++++++++++++++++
patches/werror-langtools.patch | 28 +++++++
13 files changed, 504 insertions(+), 8 deletions(-)
diffs (truncated from 663 to 500 lines):
diff -r 60bd733bd20c -r 727519ab8096 .hgtags
--- a/.hgtags Thu Aug 16 01:07:29 2012 +0100
+++ b/.hgtags Fri Aug 24 01:53:20 2012 +0100
@@ -33,3 +33,4 @@
e4c9d9bd4a99ee2993e6737a84ccb9792fa7c4d1 icedtea-2.0-branchpoint
d35c742babc02eb874684ea7cb647ef5eda55c75 icedtea-2.1-branchpoint
2917541bbda4f6745b157f39d7bd39472cae5235 icedtea-2.2-branchpoint
+60c41b88775a8043ff4922278eb0e801c330e8fe icedtea-2.3-branchpoint
diff -r 60bd733bd20c -r 727519ab8096 ChangeLog
--- a/ChangeLog Thu Aug 16 01:07:29 2012 +0100
+++ b/ChangeLog Fri Aug 24 01:53:20 2012 +0100
@@ -1,3 +1,72 @@
+2012-08-23 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR1138: jvisualvm.1 should not be installed in OpenJDK builds
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch from
+ IcedTea7 HEAD.
+ * NEWS: Updated.
+ * patches/7192804-jvisualvm.patch:
+ Don't install jvisualvm.1.
+
+2012-08-22 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR1140: Unnecessary diz files should not be installed
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch from
+ IcedTea7 HEAD.
+ * NEWS: Updated.
+ * patches/no_diz_files.patch: Backported
+ from IcedTea7 HEAD. Make sure jdk doesn't
+ create diz files when building with no_strip.
+
+2012-08-22 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * INSTALL: Update with new options.
+ Remove dead --with-netbeans. Move some
+ to appropriate section.
+ * acinclude.m4:
+ (IT_ENABLE_JAR_COMPRESSION): Set help text
+ to --disable-jar-compression as default is to
+ enable it.
+
+2012-08-22 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR1137: Allow JARs to be optionally compressed by
+ setting COMPRESS_JARS
+ * Makefile.am:
+ (ICEDTEA_ENV): Add COMPRESS_JARS="true" if
+ ENABLE_JAR_COMPRESSION is set.
+ * NEWS: Updated.
+ * acinclude.m4: Add IT_ENABLE_JAR_COMPRESSION macro.
+ * configure.ac: Include new macro.
+
+2012-08-22 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR1095: Add configure option for -Werror
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add -Werror patches
+ from IcedTea7 HEAD. Drop ecj-opts patch
+ as replaced by change to javac.in.
+ (WERROR_STATUS): Set to true or false
+ depending on if ENABLE_WERROR is set or not.
+ (ICEDTEA_ENV): Use WERROR_STATUS to set
+ JAVAC_WARNINGS_FATAL & COMPILER_WARNINGS_FATAL.
+ * acinclude.m4:
+ (IT_ENABLE_WERROR): New macro to enable -Werror.
+ This is disabled by default.
+ * configure.ac: Call IT_ENABLE_WERROR.
+ * javac.in: Handle stripping of arguments which
+ take parameters, specifically -Xmaxwarns.
+ * patches/werror-hotspot.patch:
+ Allow COMPILER_WARNINGS_FATAL to turn off -Werror.
+ * patches/werror-jdk.patch:
+ Remove cases where -Werror is forced on, allowing
+ JAVAC_WARNINGS_FATAL and COMPILER_WARNINGS_FATAL
+ to work correctly throughout.
+ * patches/werror-langtools.patch:
+ Allow JAVAC_WARNINGS_FATAL=false to turn off -Werror.
+ * NEWS: Updated.
+
2012-08-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
diff -r 60bd733bd20c -r 727519ab8096 INSTALL
--- a/INSTALL Thu Aug 16 01:07:29 2012 +0100
+++ b/INSTALL Fri Aug 24 01:53:20 2012 +0100
@@ -89,6 +89,19 @@
downloading and extracting a tarball.
* --enable-system-lcms: Build using the system installation of LCMS2, not
the version in-tree.
+* --enable-system-zlib: Build using the system installation of Zlib, not
+ the version in-tree.
+* --enable-system-png: Build using the system installation of libpng, not
+ the version in-tree.
+* --enable-system-gif: Build using the system installation of giflib, not
+ the version in-tree.
+* --enable-system-gtk: Build and link against the system installation of
+ Gtk+ instead of trying to dynamically open it at runtime.
+* --enable-system-gio: Build and link against the system installation of
+ GIO instead of trying to dynamically open it at runtime.
+* --enable-system-fontconfig: Build and link against the system installation of
+ fontconfig instead of trying to dynamically open it at runtime.
+* --enable-compile-against-syscalls: Check for syscalls at compile-time not runtime.
* --with-gcj: Compile ecj to native code with gcj prior to building.
* --with-parallel-jobs: Run the specified number of parallel jobs when
building HotSpot and the JDK. If this option is passed without an
@@ -152,13 +165,17 @@
* --with-jamvm-src-zip: Specify the location of a JamVM tarball to avoid downloading.
* --with-hg-revision: Specify a hg revision to use (as opposed to tip) with the --enable-hg option.
* --with-tzdata-dir: Specify the location of Java timezone data, defaulting to /usr/share/javazi.
-* --with-netbeans: Specify the location of NetBeans for VisualVM, defaulting to the netbeans on the path.
* --with-abs-install-dir: The final install location of the j2sdk-image, for use in the SystemTap tapset.
* --with-llvm-config: Specify the location of the llvm-config binary.
* --with-version-suffix: Appends the given text to the JDK version output.
* --with-project: Build an OpenJDK project from the following: icedtea, jdk7, closures, cvmi, cacaiocavallo,
bsd, nio2. The default is icedtea. Use of others is at the user's risk and builds may fail. This setting
affects which forest is checked out when --enable-hg is used and the set of patches applied.
+* --with-hotspot-build: The HotSpot to use, defaulting to 'original' i.e. hs14 as bundled with OpenJDK.
+* --with-pax: The command used to PaX-mark built binaries.
+* --enable-Werror: Turn gcc & javac warnings into errors.
+* --disable-jar-compression: Don't compress the OpenJDK JAR files.
+* --disable-downloading: Don't download tarballs if not available; fail instead.
Other options may be supplied which enable or disable new features.
These are documented fully in the relevant section below.
@@ -175,8 +192,7 @@
* --enable-jamvm: Replace HotSpot with JamVM.
* --enable-shark: Build the Shark LLVM-based JIT.
* --enable-zero: Build the zero assembler port on x86/x86_64/sparc platforms.
-* --with-hotspot-build: The HotSpot to use, defaulting to 'original' i.e. hs14 as bundled with OpenJDK.
-* --with-rhino: Include Javascript support using Rhino.
+* --with-rhino: Include Javascript support using Rhino (location may optionally be specified).
* --with-additional-vms=vm-list: Additional VMs to build using the system described
below.
diff -r 60bd733bd20c -r 727519ab8096 Makefile.am
--- a/Makefile.am Thu Aug 16 01:07:29 2012 +0100
+++ b/Makefile.am Fri Aug 24 01:53:20 2012 +0100
@@ -240,7 +240,12 @@
# Patch list
-ICEDTEA_PATCHES =
+ICEDTEA_PATCHES = \
+ patches/werror-jdk.patch \
+ patches/werror-langtools.patch \
+ patches/werror-hotspot.patch \
+ patches/no_diz_files.patch \
+ patches/7192804-jvisualvm.patch
# Conditional patches
@@ -311,7 +316,6 @@
patches/boot/corba-orb.patch \
patches/boot/demos.patch \
patches/boot/ecj-fphexconstants.patch \
- patches/boot/ecj-opts.patch \
patches/boot/fontconfig.patch \
patches/boot/generated-comments.patch \
patches/boot/xbootclasspath.patch \
@@ -415,6 +419,12 @@
ICEDTEA_PKG = $(EMPTY) (${PKGVERSION})
endif
+if ENABLE_WERROR
+WERROR_STATUS=true
+else
+WERROR_STATUS=false
+endif
+
ICEDTEA_ENV = \
ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" \
ANT="$(ANT)" \
@@ -464,7 +474,9 @@
USE_SYSTEM_CUPS="true" \
CUPS_LIBS="${CUPS_LIBS}" \
CUPS_CFLAGS="${CUPS_CFLAGS}" \
- STRIP_POLICY=no_strip
+ STRIP_POLICY=no_strip \
+ JAVAC_WARNINGS_FATAL="$(WERROR_STATUS)" \
+ COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)"
if ENABLE_CACAO
ICEDTEA_ENV += \
@@ -563,6 +575,11 @@
COMPILE_AGAINST_SYSCALLS="true"
endif
+if ENABLE_JAR_COMPRESSION
+ICEDTEA_ENV += \
+ COMPRESS_JARS="true"
+endif
+
# OpenJDK boot build environment.
ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \
diff -r 60bd733bd20c -r 727519ab8096 NEWS
--- a/NEWS Thu Aug 16 01:07:29 2012 +0100
+++ b/NEWS Fri Aug 24 01:53:20 2012 +0100
@@ -18,6 +18,10 @@
- PR1050: Stream objects not garbage collected
- PR1119: Only add classes to rt-source-files.txt if the class (or one or more of its methods/fields)
are actually missing from the boot JDK
+ - PR1095: Add configure option for -Werror
+ - PR1137: Allow JARs to be optionally compressed by setting COMPRESS_JARS
+ - PR1140: Unnecessary diz files should not be installed
+ - PR1138: jvisualvm.1 should not be installed in OpenJDK builds
* JamVM
- ARMv6 armhf: Changes for Raspbian (Raspberry Pi)
- PPC: Don't use lwsync if it isn't supported
diff -r 60bd733bd20c -r 727519ab8096 acinclude.m4
--- a/acinclude.m4 Thu Aug 16 01:07:29 2012 +0100
+++ b/acinclude.m4 Fri Aug 24 01:53:20 2012 +0100
@@ -2356,3 +2356,47 @@
AM_CONDITIONAL([LACKS_$1], test x"${it_cv_$1}" = "xyes")
AC_PROVIDE([$0])dnl
])
+
+AC_DEFUN([IT_ENABLE_WERROR],
+[
+ AC_MSG_CHECKING([whether to enable -Werror])
+ AC_ARG_ENABLE([Werror],
+ [AS_HELP_STRING(--enable-Werror,build with -Werror [[default=no]])],
+ [
+ case "${enableval}" in
+ yes)
+ enable_werror=yes
+ ;;
+ *)
+ enable_werror=no
+ ;;
+ esac
+ ],
+ [
+ enable_werror=no
+ ])
+ AC_MSG_RESULT([$enable_werror])
+ AM_CONDITIONAL([ENABLE_WERROR], test x"${enable_werror}" = "xyes")
+])
+
+AC_DEFUN([IT_ENABLE_JAR_COMPRESSION],
+[
+ AC_MSG_CHECKING([whether to enable JAR compression])
+ AC_ARG_ENABLE([jar-compression],
+ [AS_HELP_STRING(--disable-jar-compression,compress built jars [[default=yes]])],
+ [
+ case "${enableval}" in
+ no)
+ enable_jar_compression=no
+ ;;
+ *)
+ enable_jar_compression=yes
+ ;;
+ esac
+ ],
+ [
+ enable_jar_compression=yes
+ ])
+ AC_MSG_RESULT([$enable_jar_compression])
+ AM_CONDITIONAL([ENABLE_JAR_COMPRESSION], test x"${enable_jar_compression}" = "xyes")
+])
diff -r 60bd733bd20c -r 727519ab8096 configure.ac
--- a/configure.ac Thu Aug 16 01:07:29 2012 +0100
+++ b/configure.ac Fri Aug 24 01:53:20 2012 +0100
@@ -152,6 +152,8 @@
IT_WITH_JAMVM_SRC_ZIP
IT_DISABLE_OPTIMIZATIONS
+IT_ENABLE_WERROR
+IT_ENABLE_JAR_COMPRESSION
IT_SET_SHARK_BUILD
IT_ENABLE_ZERO_BUILD
IT_CHECK_ADDITIONAL_VMS
diff -r 60bd733bd20c -r 727519ab8096 javac.in
--- a/javac.in Thu Aug 16 01:07:29 2012 +0100
+++ b/javac.in Fri Aug 24 01:53:20 2012 +0100
@@ -1,7 +1,8 @@
#!/usr/bin/perl -w
use strict;
use constant NO_DUP_ARGS => qw(-source -target -d -encoding);
-use constant STRIP_ARGS => qw(-Werror -implicit:none);
+use constant STRIP_ARGS_1 => qw(-Werror -implicit:none);
+use constant STRIP_ARGS_2 => qw(-Xmaxwarns);
my ($ECJ_WARNINGS, $JAVAC_WARNINGS);
@@ -38,12 +39,18 @@
}
}
- for my $opt (STRIP_ARGS)
+ for my $opt (STRIP_ARGS_1)
{
my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
splice @new_args, $_, 1 for @indices;
}
+ for my $opt (STRIP_ARGS_2)
+ {
+ my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
+ splice @new_args, $_, 2 for @indices;
+ }
+
return @new_args;
}
diff -r 60bd733bd20c -r 727519ab8096 patches/7192804-jvisualvm.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/7192804-jvisualvm.patch Fri Aug 24 01:53:20 2012 +0100
@@ -0,0 +1,31 @@
+# HG changeset patch
+# User andrew
+# Date 1345732943 -3600
+# Node ID d06702bfc987d0679d0c047b0897fbe7a684a608
+# Parent 968de9a6cf662529fd0fac7b54d9f8614d338da0
+7192804: Build should not install jvisualvm man page for OpenJDK
+Summary: OpenJDK builds don't ship VisualVM so shouldn't ship its man page either.
+Reviewed-by: dholmes
+
+diff --git a/make/common/Release.gmk b/make/common/Release.gmk
+--- openjdk/jdk/make/common/Release.gmk
++++ openjdk/jdk/make/common/Release.gmk
+@@ -158,7 +158,6 @@
+ jstack.1 \
+ jstat.1 \
+ jstatd.1 \
+- jvisualvm.1 \
+ native2ascii.1 \
+ rmic.1 \
+ schemagen.1 \
+@@ -167,6 +166,10 @@
+ wsimport.1 \
+ xjc.1
+
++ifndef OPENJDK
++ JDK_MAN_PAGES += jvisualvm.1
++endif
++
+ ifeq ($(PLATFORM), solaris)
+ MANBASEDIRS=$(JDK_TOPDIR)/src/solaris/doc $(IMPORTDOCDIR)
+ MAN1SUBDIR=sun/man/man1
diff -r 60bd733bd20c -r 727519ab8096 patches/no_diz_files.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/no_diz_files.patch Fri Aug 24 01:53:20 2012 +0100
@@ -0,0 +1,143 @@
+diff --git a/make/common/Library.gmk b/make/common/Library.gmk
+--- openjdk/jdk/make/common/Library.gmk
++++ openjdk/jdk/make/common/Library.gmk
+@@ -269,6 +269,7 @@
+ ifneq ($(PLATFORM), macosx)
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
++ ifneq ($(STRIP_POLICY),no_strip)
+ ifeq ($(PLATFORM), solaris)
+ # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
+ # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
+@@ -279,19 +280,20 @@
+ #
+ # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
+ # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
+- (set -e ; \
+- $(CD) $(@D) ; \
+- $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \
+- $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
+- $(ADD_GNU_DEBUGLINK) $(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \
+- )
++ (set -e ; \
++ $(CD) $(@D) ; \
++ $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \
++ $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
++ $(ADD_GNU_DEBUGLINK) $(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \
++ )
+ else # PLATFORM != solaris
+- (set -e ; \
+- $(CD) $(@D) ; \
+- $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
+- $(OBJCOPY) --add-gnu-debuglink=$(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \
+- )
+- endif # PLATFORM == solaris
++ (set -e ; \
++ $(CD) $(@D) ; \
++ $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
++ $(OBJCOPY) --add-gnu-debuglink=$(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \
++ )
++ endif # PLATFORM == solaris
++ endif # STRIP_POLICY != no_strip
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(STRIP) $@
+ else
+@@ -305,12 +307,14 @@
+ # implied else here is no stripping at all
+ endif
+ endif
+- ifeq ($(ZIP_DEBUGINFO_FILES),1)
+- (set -e ; \
+- $(CD) $(@D) ; \
+- $(ZIPEXE) -q $(LIB_PREFIX)$(LIBRARY).diz $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
+- $(RM) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
+- )
++ ifneq ($(STRIP_POLICY),no_strip)
++ ifeq ($(ZIP_DEBUGINFO_FILES),1)
++ (set -e ; \
++ $(CD) $(@D) ; \
++ $(ZIPEXE) -q $(LIB_PREFIX)$(LIBRARY).diz $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
++ $(RM) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
++ )
++ endif
+ endif
+ endif # LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS
+ endif # ENABLE_FULL_DEBUG_SYMBOLS
+diff --git a/make/common/Program.gmk b/make/common/Program.gmk
+--- openjdk/jdk/make/common/Program.gmk
++++ openjdk/jdk/make/common/Program.gmk
+@@ -276,7 +276,8 @@
+ ifneq ($(PLATFORM), macosx)
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifeq ($(PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
+- ifeq ($(PLATFORM), solaris)
++ ifneq ($(STRIP_POLICY),no_strip)
++ ifeq ($(PLATFORM), solaris)
+ # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
+ # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
+ # empty section headers until a fixed $(OBJCOPY) is available.
+@@ -286,19 +287,20 @@
+ #
+ # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
+ # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
+- (set -e ; \
+- $(CD) $(@D) ; \
+- $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \
+- $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \
+- $(ADD_GNU_DEBUGLINK) $(@F).debuginfo $(@F) ; \
+- )
+- else # PLATFORM != solaris
+- (set -e ; \
+- $(CD) $(@D) ; \
+- $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \
+- $(OBJCOPY) --add-gnu-debuglink=$(@F).debuginfo $(@F) ; \
+- )
+- endif # PLATFORM == solaris
++ (set -e ; \
++ $(CD) $(@D) ; \
++ $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \
++ $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \
++ $(ADD_GNU_DEBUGLINK) $(@F).debuginfo $(@F) ; \
++ )
++ else # PLATFORM != solaris
++ (set -e ; \
++ $(CD) $(@D) ; \
++ $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \
++ $(OBJCOPY) --add-gnu-debuglink=$(@F).debuginfo $(@F) ; \
++ )
++ endif # PLATFORM == solaris
++ endif
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(STRIP) $@
+ else
+@@ -312,17 +314,19 @@
+ # implied else here is no stripping at all
+ endif
+ endif
+- ifeq ($(ZIP_DEBUGINFO_FILES),1)
+- (set -e ; \
+- $(CD) $(@D) ; \
+- $(ZIPEXE) -q $(@F).diz $(@F).debuginfo ; \
+- $(RM) $(@F).debuginfo ; \
+- )
+- # save ZIP'ed debug info with rest of the program's build artifacts
+- $(MV) $@.diz $(OBJDIR)
+- else
+- # save debug info with rest of the program's build artifacts
+- $(MV) $@.debuginfo $(OBJDIR)
++ ifneq ($(STRIP_POLICY),no_strip)
++ ifeq ($(ZIP_DEBUGINFO_FILES),1)
++ (set -e ; \
++ $(CD) $(@D) ; \
++ $(ZIPEXE) -q $(@F).diz $(@F).debuginfo ; \
++ $(RM) $(@F).debuginfo ; \
++ )
++ # save ZIP'ed debug info with rest of the program's build artifacts
++ $(MV) $@.diz $(OBJDIR)
++ else
++ # save debug info with rest of the program's build artifacts
++ $(MV) $@.debuginfo $(OBJDIR)
++ endif
+ endif
+ endif # PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS
+ endif # ENABLE_FULL_DEBUG_SYMBOLS
diff -r 60bd733bd20c -r 727519ab8096 patches/werror-hotspot.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/werror-hotspot.patch Fri Aug 24 01:53:20 2012 +0100
@@ -0,0 +1,56 @@
+diff --git a/make/linux/makefiles/adlc.make b/make/linux/makefiles/adlc.make
+--- openjdk/hotspot/make/linux/makefiles/adlc.make
++++ openjdk/hotspot/make/linux/makefiles/adlc.make
+@@ -68,7 +68,9 @@
+
+ # CFLAGS_WARN holds compiler options to suppress/enable warnings.
+ # Compiler warnings are treated as errors
More information about the distro-pkg-dev
mailing list