Sophie

Sophie

distrib > Mageia > 3 > i586 > media > core-release-src > by-pkgid > 8daf2e1da87d6ee2406f0321b0c46865 > files > 28

java-1.7.0-openjdk-1.7.0.19-2.3.9.1.mga3.src.rpm

diff -Nru openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk openjdk-boot/corba/make/common/shared/Defs-java.gmk
--- openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk	2008-10-22 18:45:43.000000000 +0100
+++ openjdk-boot/corba/make/common/shared/Defs-java.gmk	2008-10-22 18:49:29.000000000 +0100
@@ -75,7 +75,9 @@
 JAVAC_JVM_FLAGS    += $(JAVA_TOOLS_FLAGS:%=-J%)
 
 # The jar -J options are special, must be added at the end of the command line
+ifneq (,$(JAR_KNOWS_J_OPTIONS))
 JAR_JFLAGS       = $(JAVA_TOOLS_FLAGS:%=-J%)
+endif
 
 # JAVA_TOOLS_DIR is the default location to find Java tools to run, if
 #    langtools is not available.
diff -Nru openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk openjdk-boot/jdk/make/common/shared/Defs-java.gmk
--- openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk	2008-10-22 19:14:30.000000000 +0100
+++ openjdk-boot/jdk/make/common/shared/Defs-java.gmk	2008-10-22 19:15:00.000000000 +0100
@@ -82,7 +82,9 @@
 JAVAC_JVM_FLAGS    += $(JAVA_TOOLS_FLAGS:%=-J%)
 
 # The jar -J options are special, must be added at the end of the command line
+ifneq (,$(JAR_KNOWS_J_OPTIONS))
 JAR_JFLAGS       = $(JAVA_TOOLS_FLAGS:%=-J%)
+endif
 
 # JAVA_TOOLS_DIR is the default location to find Java tools to run, if
 #    langtools is not available.