Sophie

Sophie

distrib > Mandriva > 2009.1 > x86_64 > by-pkgid > 5d9f96a61df66f474656cde507a94c17 > files > 7

java-1.6.0-openjdk-1.6.0.0-0.19.b14.3mdv2009.1.src.rpm

--- patches/hotspot/14.0b08/icedtea-shark-build.patch.orig	2008-12-17 17:27:15.000000000 +0100
+++ patches/hotspot/14.0b08/icedtea-shark-build.patch	2008-12-17 17:30:25.000000000 +0100
@@ -135,11 +135,11 @@
 +ifdef ICEDTEA_SHARK_BUILD
    STATIC_CXX = false
  else
--  STATIC_CXX = true
+-  STATIC_CXX = false
 +  ifeq ($(ZERO_LIBARCH), ppc64)
 +    STATIC_CXX = false
 +  else
-+    STATIC_CXX = true
++    STATIC_CXX = false
 +  endif
  endif
  
@@ -153,7 +153,7 @@
 +LIBS_VM   += $(LLVM_LIBS)
 +endif
  
- LINK_VM = $(LINK_LIB.c)
+ LINK_VM = $(LINK_LIB.cpp)
  
 diff -Nru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile
 --- openjdk.orig/hotspot/make/Makefile	2008-07-13 00:38:02.000000000 +0100
--- patches/hotspot/original/icedtea-shark-build.patch.orig	2008-12-17 17:29:32.000000000 +0100
+++ patches/hotspot/original/icedtea-shark-build.patch	2008-12-17 17:31:03.000000000 +0100
@@ -175,11 +175,11 @@
 +ifdef ICEDTEA_SHARK_BUILD
    STATIC_CXX = false
  else
--  STATIC_CXX = true
+-  STATIC_CXX = false
 +  ifeq ($(ZERO_LIBARCH), ppc64)
 +    STATIC_CXX = false
 +  else
-+    STATIC_CXX = true
++    STATIC_CXX = false
 +  endif
  endif
  
@@ -193,7 +193,7 @@
 +LIBS_VM   += $(LLVM_LIBS)
 +endif
  
- LINK_VM = $(LINK_LIB.c)
+ LINK_VM = $(LINK_LIB.cpp)
  
 --- openjdk/hotspot/build/linux/makefiles/buildtree.make.orig	2008-12-05 10:41:34.000000000 +0000
 +++ openjdk/hotspot/build/linux/makefiles/buildtree.make	2008-12-05 10:50:52.000000000 +0000