# HG changeset patch # User Andrew John Hughes # Date 1363019099 0 # Node ID 1bcc6dd061faaf446d78c829b481227782934479 # Parent cf4897fbb9f5537f15f7742a0919ea02ac2d6b6d Don't strip binaries during OpenJDK build. Leave this to the end user. 2013-03-11 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add patch. (ICEDTEA_ENV): Add ALT_STRIP_POLICY=no_strip. * patches/no_stripping.patch: Don't create debuginfo files when no_strip is set. * NEWS: Updated with this fix and previous set. diff -r cf4897fbb9f5 -r 1bcc6dd061fa ChangeLog --- a/ChangeLog Mon Mar 11 15:11:10 2013 +0000 +++ b/ChangeLog Mon Mar 11 16:24:59 2013 +0000 @@ -1,3 +1,12 @@ +2013-03-11 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add patch. + (ICEDTEA_ENV): Add ALT_STRIP_POLICY=no_strip. + * patches/no_stripping.patch: + Don't create debuginfo files when no_strip is set. + * NEWS: Updated with this fix and previous set. + 2013-03-11 Andrew John Hughes * Makefile.am: diff -r cf4897fbb9f5 -r 1bcc6dd061fa Makefile.am --- a/Makefile.am Mon Mar 11 15:11:10 2013 +0000 +++ b/Makefile.am Mon Mar 11 16:24:59 2013 +0000 @@ -240,7 +240,8 @@ patches/8004344-toolkiterrorhandler.patch \ patches/8006179-lookup_using_findvirtual.patch \ patches/8006882-sun.proxy.patch \ - patches/pr1303-ifdef_fix.patch + patches/pr1303-ifdef_fix.patch \ + patches/no_stripping.patch # Conditional patches @@ -436,7 +437,8 @@ BUILD_CPP="$(CXX)" \ USE_SYSTEM_CUPS="true" \ CUPS_LIBS="${CUPS_LIBS}" \ - CUPS_CFLAGS="${CUPS_CFLAGS}" + CUPS_CFLAGS="${CUPS_CFLAGS}" \ + ALT_STRIP_POLICY=no_strip if ENABLE_CACAO ICEDTEA_ENV += \ diff -r cf4897fbb9f5 -r 1bcc6dd061fa NEWS --- a/NEWS Mon Mar 11 15:11:10 2013 +0000 +++ b/NEWS Mon Mar 11 16:24:59 2013 +0000 @@ -15,6 +15,14 @@ * Security fixes - S8007014, CVE-2013-0809: Improve image handling - S8007675, CVE-2013-1493: Improve color conversion +* Backports + - S8002344: Krb5LoginModule config class does not return proper KDC list from DNS + - S8004344: Fix a crash in ToolkitErrorHandler() in XlibWrapper.c + - S8006179: JSR292 MethodHandles lookup with interface using findVirtual() + - S8006882: Proxy generated classes in sun.proxy package breaks JMockit +* Bug fixes + - PR1303: Correct #ifdef to #if + - Stop libraries being stripped in the OpenJDK build. New in release 2.1.6 (2013-02-20): diff -r cf4897fbb9f5 -r 1bcc6dd061fa patches/no_stripping.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/no_stripping.patch Mon Mar 11 16:24:59 2013 +0000 @@ -0,0 +1,180 @@ +diff -Nru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make +--- openjdk.orig/hotspot/make/linux/makefiles/defs.make 2013-02-15 00:04:42.000000000 +0000 ++++ openjdk/hotspot/make/linux/makefiles/defs.make 2013-03-11 15:29:11.691786343 +0000 +@@ -186,7 +186,9 @@ + EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so + ifneq ($(ZERO_BUILD), true) + ifneq ($(OBJCOPY),) +- EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo ++ ifneq ($(STRIP_POLICY),no_strip) ++ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo ++ endif + endif + endif + +@@ -198,7 +200,9 @@ + EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so + ifneq ($(ZERO_BUILD), true) + ifneq ($(OBJCOPY),) +- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo ++ ifneq ($(STRIP_POLICY),no_strip) ++ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo ++ endif + endif + endif + endif +@@ -208,7 +212,9 @@ + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so + ifneq ($(OBJCOPY),) +- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo ++ ifneq ($(STRIP_POLICY),no_strip) ++ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo ++ endif + endif + endif + endif +@@ -221,8 +227,10 @@ + $(EXPORT_LIB_DIR)/sa-jdi.jar + ifneq ($(ZERO_BUILD), true) + ifneq ($(OBJCOPY),) +- ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo +- ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo ++ ifneq ($(STRIP_POLICY),no_strip) ++ ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo ++ ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo ++ endif + endif + endif + ADD_SA_BINARIES/ppc = +diff -Nru openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make +--- openjdk.orig/hotspot/make/linux/makefiles/jsig.make 2013-02-15 00:04:42.000000000 +0000 ++++ openjdk/hotspot/make/linux/makefiles/jsig.make 2013-03-11 15:27:13.065876291 +0000 +@@ -59,8 +59,10 @@ + $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl + $(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); } + ifneq ($(OBJCOPY),) ++ ifneq ($(STRIP_POLICY),no_strip) + $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO) + $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@ ++ endif + ifeq ($(STRIP_POLICY),all_strip) + $(QUIETLY) $(STRIP) $@ + else +diff -Nru openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make +--- openjdk.orig/hotspot/make/linux/makefiles/saproc.make 2013-02-15 00:04:42.000000000 +0000 ++++ openjdk/hotspot/make/linux/makefiles/saproc.make 2013-03-11 15:27:13.065876291 +0000 +@@ -87,8 +87,10 @@ + -lthread_db + $(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); } + ifneq ($(OBJCOPY),) ++ ifneq ($(STRIP_POLICY),no_strip) + $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO) + $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@ ++ endif + ifeq ($(STRIP_POLICY),all_strip) + $(QUIETLY) $(STRIP) $@ + else +diff -Nru openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make +--- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2013-02-15 00:04:42.000000000 +0000 ++++ openjdk/hotspot/make/linux/makefiles/vm.make 2013-03-11 15:27:13.065876291 +0000 +@@ -328,8 +328,10 @@ + } + ifeq ($(CROSS_COMPILE_ARCH),) + ifneq ($(OBJCOPY),) ++ ifneq ($(STRIP_POLICY),no_strip) + $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO) + $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@ ++ endif + ifeq ($(STRIP_POLICY),all_strip) + $(QUIETLY) $(STRIP) $@ + else +diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/dtrace.make openjdk/hotspot/make/solaris/makefiles/dtrace.make +--- openjdk.orig/hotspot/make/solaris/makefiles/dtrace.make 2013-02-15 00:04:42.000000000 +0000 ++++ openjdk/hotspot/make/solaris/makefiles/dtrace.make 2013-03-11 15:27:13.065876291 +0000 +@@ -107,8 +107,10 @@ + $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc + [ -f $(XLIBJVM_DB_G) ] || { ln -s $(LIBJVM_DB) $(XLIBJVM_DB_G); } + ifneq ($(OBJCOPY),) ++ ifneq ($(STRIP_POLICY),no_strip) + $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DB_DEBUGINFO) + $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(XLIBJVM_DB_DEBUGINFO) $@ ++ endif + ifeq ($(STRIP_POLICY),all_strip) + $(QUIETLY) $(STRIP) $@ + else +@@ -127,8 +129,10 @@ + $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor + [ -f $(XLIBJVM_DTRACE_G) ] || { ln -s $(LIBJVM_DTRACE) $(XLIBJVM_DTRACE_G); } + ifneq ($(OBJCOPY),) ++ ifneq ($(STRIP_POLICY),no_strip) + $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DTRACE_DEBUGINFO) + $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(XLIBJVM_DTRACE_DEBUGINFO) $@ ++ endif + ifeq ($(STRIP_POLICY),all_strip) + $(QUIETLY) $(STRIP) $@ + else +@@ -186,8 +190,10 @@ + $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc + [ -f $(LIBJVM_DB_G) ] || { ln -s $@ $(LIBJVM_DB_G); } + ifneq ($(OBJCOPY),) ++ ifneq ($(STRIP_POLICY),no_strip) + $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DB_DEBUGINFO) + $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DB_DEBUGINFO) $@ ++ endif + ifeq ($(STRIP_POLICY),all_strip) + $(QUIETLY) $(STRIP) $@ + else +@@ -205,8 +211,10 @@ + $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor + [ -f $(LIBJVM_DTRACE_G) ] || { ln -s $@ $(LIBJVM_DTRACE_G); } + ifneq ($(OBJCOPY),) ++ ifneq ($(STRIP_POLICY),no_strip) + $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DTRACE_DEBUGINFO) + $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DTRACE_DEBUGINFO) $@ ++ endif + ifeq ($(STRIP_POLICY),all_strip) + $(QUIETLY) $(STRIP) $@ + else +diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/jsig.make openjdk/hotspot/make/solaris/makefiles/jsig.make +--- openjdk.orig/hotspot/make/solaris/makefiles/jsig.make 2013-02-15 00:04:42.000000000 +0000 ++++ openjdk/hotspot/make/solaris/makefiles/jsig.make 2013-03-11 15:27:13.065876291 +0000 +@@ -55,8 +55,10 @@ + $(LFLAGS_JSIG) -o $@ $< -ldl + [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); } + ifneq ($(OBJCOPY),) ++ ifneq ($(STRIP_POLICY),no_strip) + $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO) + $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@ ++ endif + ifeq ($(STRIP_POLICY),all_strip) + $(QUIETLY) $(STRIP) $@ + else +diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/saproc.make openjdk/hotspot/make/solaris/makefiles/saproc.make +--- openjdk.orig/hotspot/make/solaris/makefiles/saproc.make 2013-02-15 00:04:42.000000000 +0000 ++++ openjdk/hotspot/make/solaris/makefiles/saproc.make 2013-03-11 15:27:13.065876291 +0000 +@@ -106,8 +106,10 @@ + -ldl -ldemangle -lthread -lc + [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); } + ifneq ($(OBJCOPY),) ++ ifneq ($(STRIP_POLICY),no_strip) + $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO) + $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@ ++ endif + ifeq ($(STRIP_POLICY),all_strip) + $(QUIETLY) $(STRIP) $@ + else +diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/vm.make openjdk/hotspot/make/solaris/makefiles/vm.make +--- openjdk.orig/hotspot/make/solaris/makefiles/vm.make 2013-02-15 00:04:42.000000000 +0000 ++++ openjdk/hotspot/make/solaris/makefiles/vm.make 2013-03-11 15:27:13.065876291 +0000 +@@ -284,8 +284,10 @@ + $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G) + $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1 + ifneq ($(OBJCOPY),) ++ ifneq ($(STRIP_POLICY),no_strip) + $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO) + $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@ ++ endif + ifeq ($(STRIP_POLICY),all_strip) + $(QUIETLY) $(STRIP) $@ + else