Hello community, here is the log from the commit of package java-1_7_0-openjdk for openSUSE:Factory checked in at 2017-04-24 09:44:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_7_0-openjdk" Mon Apr 24 09:44:58 2017 rev:84 rq:482887 version:1.7.0.131 Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk-bootstrap.changes 2017-02-19 00:58:56.801154247 +0100 +++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk-bootstrap.changes 2017-04-24 09:45:00.639976909 +0200 @@ -1,0 +2,8 @@ +Mon Mar 20 11:12:00 UTC 2017 - rguent...@suse.com + +- Add java-1_7_0-openjdk-libjvm-link.patch to link libjvm and libmawt + with g++ to support the mix of GCC 6 java and GCC 7 C++ compiler. +- Get ecj.jar path from gcj, use the gcc variant that provides Java + to build C code to make sure jni.h is available. + +------------------------------------------------------------------- java-1_7_0-openjdk.changes: same change New: ---- java-1_7_0-openjdk-libjvm-link.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.T9bBWM/_old 2017-04-24 09:45:08.022932668 +0200 +++ /var/tmp/diff_new_pack.T9bBWM/_new 2017-04-24 09:45:08.022932668 +0200 @@ -214,6 +214,7 @@ Patch1006: java-1_7_0-openjdk-override.patch Patch2000: java-1_7_0-openjdk-gcc6.patch Patch10011: openjdk-7-src-b147-no-return-in-nonvoid-hotspot.patch +Patch10012: java-1_7_0-openjdk-libjvm-link.patch BuildRequires: alsa-lib-devel #BuildRequires: xalan-j2 # make sure to use bootstrap requires of ant @@ -533,7 +534,7 @@ # javac one. JAVAC=`pwd`/javacwrap %if 0%{?suse_version} >= 1200 -ECJJAR=`gcc -print-file-name=ecj.jar` +ECJJAR=`gcj -print-file-name=ecj.jar` %else ECJJAR=%{_datadir}/java/eclipse-ecj.jar %endif @@ -542,6 +543,7 @@ exec gij -cp $ECJJAR org.eclipse.jdt.internal.compiler.batch.Main \${1+\$@} EOF chmod +x ${JAVAC} +export CC=gcc-$(gcj -dumpversion) %endif export CFLAGS=$(rpm -E '%{optflags}' | sed 's/-Wall\>//') @@ -639,6 +641,7 @@ patch -p1 -i %{PATCH1001} patch -p1 -i %{PATCH10011} +patch -p0 -i %{PATCH10012} %if %{with bootstrap} patch -p0 -i %{PATCH1006} ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.T9bBWM/_old 2017-04-24 09:45:08.070925880 +0200 +++ /var/tmp/diff_new_pack.T9bBWM/_new 2017-04-24 09:45:08.074925314 +0200 @@ -214,6 +214,7 @@ Patch1006: java-1_7_0-openjdk-override.patch Patch2000: java-1_7_0-openjdk-gcc6.patch Patch10011: openjdk-7-src-b147-no-return-in-nonvoid-hotspot.patch +Patch10012: java-1_7_0-openjdk-libjvm-link.patch BuildRequires: alsa-lib-devel #BuildRequires: xalan-j2 # make sure to use bootstrap requires of ant @@ -533,7 +534,7 @@ # javac one. JAVAC=`pwd`/javacwrap %if 0%{?suse_version} >= 1200 -ECJJAR=`gcc -print-file-name=ecj.jar` +ECJJAR=`gcj -print-file-name=ecj.jar` %else ECJJAR=%{_datadir}/java/eclipse-ecj.jar %endif @@ -542,6 +543,7 @@ exec gij -cp $ECJJAR org.eclipse.jdt.internal.compiler.batch.Main \${1+\$@} EOF chmod +x ${JAVAC} +export CC=gcc-$(gcj -dumpversion) %endif export CFLAGS=$(rpm -E '%{optflags}' | sed 's/-Wall\>//') @@ -639,6 +641,7 @@ patch -p1 -i %{PATCH1001} patch -p1 -i %{PATCH10011} +patch -p0 -i %{PATCH10012} %if %{with bootstrap} patch -p0 -i %{PATCH1006} ++++++ java-1_7_0-openjdk-libjvm-link.patch ++++++ --- openjdk/hotspot/make/linux/makefiles/vm.make.orig 2017-03-20 10:38:51.549994978 +0100 +++ openjdk/hotspot/make/linux/makefiles/vm.make 2017-03-20 10:39:34.778654605 +0100 @@ -322,7 +322,7 @@ LFLAGS_VM += $(LLVM_LDFLAGS) endif -LINK_VM = $(LINK_LIB.CC) +LINK_VM = $(LINK_LIB.CXX) # rule for building precompiled header $(PRECOMPILED_HEADER): --- openjdk/jdk/make/sun/awt/mawt.gmk.orig 2017-03-20 11:29:54.428908416 +0100 +++ openjdk/jdk/make/sun/awt/mawt.gmk 2017-03-20 11:34:26.497137295 +0100 @@ -75,6 +75,8 @@ # are found at runtime. LD_RUNPATH_EXTRAS = .. +CPLUSPLUSLIBRARY=yes + include $(BUILDDIR)/common/Mapfile-vers.gmk include $(BUILDDIR)/common/Library.gmk