Mercurial > hg > icedtea15
changeset 2366:7f137bd40e46
PR616, PR99: Don't statically link libstdc++
2011-03-29 Andrew John Hughes <ahughes@redhat.com>
PR616, PR99: Don't statically link libstdc++
* Makefile.am: Bump changesets and checksums
to incorporate static CXX support.
(ICEDTEA_ENV): Set STATIC_CXX to false.
* NEWS: Mention removal of static linking of
libstdc++.
* patches/icedtea-gcc-suffix.patch:
Regenerated.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 30 Mar 2011 01:27:14 +0100 |
| parents | eeb7d84e7ae5 |
| children | fef8fe66fdf5 |
| files | ChangeLog Makefile.am NEWS patches/icedtea-gcc-suffix.patch |
| diffstat | 4 files changed, 28 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Mar 21 20:47:22 2011 +0000 +++ b/ChangeLog Wed Mar 30 01:27:14 2011 +0100 @@ -1,3 +1,14 @@ +2011-03-29 Andrew John Hughes <ahughes@redhat.com> + + PR616, PR99: Don't statically link libstdc++ + * Makefile.am: Bump changesets and checksums + to incorporate static CXX support. + (ICEDTEA_ENV): Set STATIC_CXX to false. + * NEWS: Mention removal of static linking of + libstdc++. + * patches/icedtea-gcc-suffix.patch: + Regenerated. + 2011-03-21 Andrew John Hughes <ahughes@redhat.com> * patches/4964490-generify_hotspot_jdi.patch:
--- a/Makefile.am Mon Mar 21 20:47:22 2011 +0000 +++ b/Makefile.am Wed Mar 30 01:27:14 2011 +0100 @@ -3,20 +3,20 @@ OPENJDK_VERSION = b123 CORBA_CHANGESET = eac2b25431d9 -HOTSPOT_CHANGESET = e452443363a7 -JAXP_CHANGESET = 17aa584100e9 +HOTSPOT_CHANGESET = 011f8af78ea1 +JAXP_CHANGESET = 17aa584100e9 JAXWS_CHANGESET = 98bca2ec154b -JDK_CHANGESET = e251bf6cbfb4 +JDK_CHANGESET = 3b8e4a1215bb LANGTOOLS_CHANGESET = a75f9777ae63 -OPENJDK_CHANGESET = 9bf0526ea1a0 +OPENJDK_CHANGESET = 714f89350919 CORBA_SHA256SUM = 106b6ff3765db0d608a7e5542a7b606fe10a2c1ebb155b866aef09f88ce481a7 -HOTSPOT_SHA256SUM = 045f86a3ccd383bde0be5d1f213d5d0165f3e30006081253c86a4545f85071a2 +HOTSPOT_SHA256SUM = cb89a70159a7f124904ecaf17683a5709787e079f476faea4e11645e4676c44d JAXP_SHA256SUM = 009baa056f2b01e313470b71542b40baab511e179b63decca00b16081e6730bd JAXWS_SHA256SUM = 5990beb8e8f2144838d52f0948b088bf74ae3ddd748b996ddbb7e7ff1605389b -JDK_SHA256SUM = 32f2d2172020046a671cca94fbe647bc9fd1af350f82090ca6edaf9ad2a537dc +JDK_SHA256SUM = 5ad0f1d0c4b4ae32675d530d5d786f5b81083fa6a51cb24a823a229f366241b7 LANGTOOLS_SHA256SUM = c60849a838df72cb7b95562a97af75fa1e3e56fcc15678885a8e154463df8417 -OPENJDK_SHA256SUM = 33a62959bc1a553299983c90ffc2c3ac724ff42300eb1bb4cbc53907ede4635b +OPENJDK_SHA256SUM = 66137d24a545e15f7be6925ebf92e456c4a42e7c862db2f6eb12cafb8cd4288b CACAO_VERSION = e321b101a9ee CACAO_SHA256SUM = 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444 @@ -466,7 +466,8 @@ DISABLE_INTREE_EC="true" \ ALT_DROPS_DIR="$(abs_top_builddir)/drops" \ ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" \ - VERBOSE="$(VERBOSE)" + VERBOSE="$(VERBOSE)" \ + STATIC_CXX="false" if WITH_CACAO ICEDTEA_ENV += \
--- a/NEWS Mon Mar 21 20:47:22 2011 +0000 +++ b/NEWS Wed Mar 30 01:27:14 2011 +0100 @@ -2,6 +2,8 @@ * NetX and the plugin moved to the IcedTea-Web project with a separate release cycle. +* Bug fixes + - PR616, PR99: Don't statically link libstdc++ * Zero/Shark - Match Shark in icedtea6, makes OSR work by removing vestigal check. - LLVM 2.7 non-product fixes.
--- a/patches/icedtea-gcc-suffix.patch Mon Mar 21 20:47:22 2011 +0000 +++ b/patches/icedtea-gcc-suffix.patch Wed Mar 30 01:27:14 2011 +0100 @@ -1,7 +1,7 @@ diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk ---- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2009-03-30 23:08:42.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2009-07-23 16:16:30.000000000 +0100 -@@ -54,17 +54,17 @@ +--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2011-03-29 14:22:49.000000000 +0100 ++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2011-03-29 23:34:00.169408541 +0100 +@@ -54,8 +54,8 @@ ifeq ($(PLATFORM), linux) # Settings specific to Linux @@ -10,8 +10,9 @@ + CC = $(COMPILER_PATH)gcc$(GCC_SUFFIX) + CPP = $(COMPILER_PATH)gcc$(GCC_SUFFIX) -E # statically link libstdc++ before C++ ABI is stablized on Linux - STATIC_CXX = true - ifeq ($(STATIC_CXX),true) + ifneq ($(STATIC_CXX),false) + STATIC_CXX = true +@@ -64,9 +64,9 @@ # g++ always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++" # We need to use gcc to statically link the C++ runtime. gcc and g++ use # the same subprocess to compile C++ files, so it is OK to build using gcc.