/hg/icedtea6: PR99, PR616: Don't statically link libstdc++ or li...

[andrew at icedtea.classpath.org]

changeset d4bc091312e0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d4bc091312e0
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Feb 03 23:55:59 2011 +0100

	PR99, PR616: Don't statically link libstdc++ or libgcc.

	2011-02-03 Andrew John Hughes <ahughes at redhat.com>

	 PR616, PR99:
		* Makefile.am: Add new patch.
		* patches/jtreg-6929067-fix.patch: Link against pthread
	explicitly now libstdc++ is no longer static.
		* patches/no-static-linking.patch: Don't statically link
	libstdc++ or libgcc.
		* NEWS: Updated.


diffstat:

5 files changed, 60 insertions(+), 2 deletions(-)
ChangeLog                       |   12 ++++++++++
Makefile.am                     |    3 +-
NEWS                            |    1 
patches/jtreg-6929067-fix.patch |    2 -
patches/no-static-linking.patch |   44 +++++++++++++++++++++++++++++++++++++++

diffs (103 lines):

diff -r eee57a146340 -r d4bc091312e0 ChangeLog
--- a/ChangeLog	Tue Feb 01 14:21:02 2011 -0500
+++ b/ChangeLog	Thu Feb 03 23:55:59 2011 +0100
@@ -1,3 +1,15 @@ 2011-02-01  Denis Lila <dlila at redhat.com
+2011-02-03  Andrew John Hughes  <ahughes at redhat.com>
+
+	PR616, PR99:
+	* Makefile.am: Add new patch.
+	* patches/jtreg-6929067-fix.patch:
+	Link against pthread explicitly now
+	libstdc++ is no longer static.
+	* patches/no-static-linking.patch:
+	Don't statically link libstdc++ or
+	libgcc.
+	* NEWS: Updated.
+
 2011-02-01  Denis Lila <dlila at redhat.com>
 
 	* NEWS: Update with the 3 backports
diff -r eee57a146340 -r d4bc091312e0 Makefile.am
--- a/Makefile.am	Tue Feb 01 14:21:02 2011 -0500
+++ b/Makefile.am	Thu Feb 03 23:55:59 2011 +0100
@@ -279,7 +279,8 @@ ICEDTEA_PATCHES = \
 	patches/jtreg-png-reader.patch \
 	patches/openjdk/4724552-CubicCurve2D.patch \
 	patches/openjdk/4493128-CubicCurve2D.patch \
-	patches/openjdk/4645692-CubicCurve2D.solveCubic.patch
+	patches/openjdk/4645692-CubicCurve2D.solveCubic.patch \
+	patches/no-static-linking.patch
 
 if !WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r eee57a146340 -r d4bc091312e0 NEWS
--- a/NEWS	Tue Feb 01 14:21:02 2011 -0500
+++ b/NEWS	Thu Feb 03 23:55:59 2011 +0100
@@ -408,6 +408,7 @@ New in release 1.10 (2011-XX-XX):
   - S4645692: CubicCurve2D.solveCubic does not return all solutions.
 * Bug fixes
   - RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors
+  - PR616, PR99: Don't statically link libstdc++ or libgcc
 
 New in release 1.9.5 (2011-02-01):
 
diff -r eee57a146340 -r d4bc091312e0 patches/jtreg-6929067-fix.patch
--- a/patches/jtreg-6929067-fix.patch	Tue Feb 01 14:21:02 2011 -0500
+++ b/patches/jtreg-6929067-fix.patch	Thu Feb 03 23:55:59 2011 +0100
@@ -45,7 +45,7 @@
 +gcc ${COMP_FLAG} -o invoke \
 +-L${TESTJAVA}/jre/lib/${ARCH}/client \
 +-L${TESTJAVA}/jre/lib/${ARCH}/server \
-+-ljvm -I${TESTJAVA}/include -I${TESTJAVA}/include/linux invoke.c
++-ljvm -lpthread -I${TESTJAVA}/include -I${TESTJAVA}/include/linux invoke.c
 +
  ./invoke
  exit $?
diff -r eee57a146340 -r d4bc091312e0 patches/no-static-linking.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/no-static-linking.patch	Thu Feb 03 23:55:59 2011 +0100
@@ -0,0 +1,44 @@
+diff -r f7afe7a5e086 make/common/shared/Compiler-gcc.gmk
+--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk	Fri Jan 21 16:21:28 2011 -0800
++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk	Thu Feb 03 11:34:13 2011 +0000
+@@ -61,7 +61,7 @@
+   CC             = $(COMPILER_PATH)gcc
+   CPP            = $(COMPILER_PATH)gcc -E
+   # statically link libstdc++ before C++ ABI is stablized on Linux
+-  STATIC_CXX     = true
++  STATIC_CXX     = false
+   ifeq ($(STATIC_CXX),true)
+     # 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
+diff -r 9797bcda6c12 make/linux/makefiles/vm.make
+--- openjdk.orig/hotspot/make/linux/makefiles/vm.make	Fri Jan 21 16:20:02 2011 -0800
++++ openjdk/hotspot/make/linux/makefiles/vm.make	Thu Feb 03 15:01:10 2011 +0000
+@@ -137,15 +137,7 @@
+ vm.def: $(Res_Files) $(Obj_Files)
+ 	sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@
+ 
+-ifeq ($(SHARK_BUILD), true)
+-  STATIC_CXX = false
+-else
+-  ifeq ($(ZERO_LIBARCH), ppc64)
+-    STATIC_CXX = false
+-  else
+-    STATIC_CXX = true
+-  endif
+-endif
++STATIC_CXX = false
+ 
+ ifeq ($(LINK_INTO),AOUT)
+   LIBJVM.o                 =
+diff -r 05436b84e93a make/common/shared/Compiler-gcc.gmk
+--- openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk	Sat Jan 16 01:04:04 2010 +0000
++++ openjdk/corba/make/common/shared/Compiler-gcc.gmk	Thu Feb 03 16:01:37 2011 +0000
+@@ -61,7 +61,7 @@
+   CC             = $(COMPILER_PATH)gcc
+   CPP            = $(COMPILER_PATH)gcc -E
+   # statically link libstdc++ before C++ ABI is stablized on Linux
+-  STATIC_CXX     = true
++  STATIC_CXX     = false
+   ifeq ($(STATIC_CXX),true)
+     # 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