Hello community, here is the log from the commit of package vpp for openSUSE:Factory checked in at 2018-01-09 14:54:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vpp (Old) and /work/SRC/openSUSE:Factory/.vpp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vpp" Tue Jan 9 14:54:54 2018 rev:7 rq:562466 version:18.01 Changes: -------- --- /work/SRC/openSUSE:Factory/vpp/vpp.changes 2017-12-12 21:23:38.916460788 +0100 +++ /work/SRC/openSUSE:Factory/.vpp.new/vpp.changes 2018-01-09 14:54:57.422840911 +0100 @@ -1,0 +2,8 @@ +Mon Jan 8 10:01:40 UTC 2018 - [email protected] + +- Added patch: + * vpp-18.01-nojavah.patch + - Replace javah invocation with javac's -h option + - Fixes build with jdk10 + +------------------------------------------------------------------- New: ---- vpp-18.01-nojavah.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vpp.spec ++++++ --- /var/tmp/diff_new_pack.u4uz0h/_old 2018-01-09 14:54:58.906771347 +0100 +++ /var/tmp/diff_new_pack.u4uz0h/_new 2018-01-09 14:54:58.906771347 +0100 @@ -1,7 +1,7 @@ # # spec file for package vpp # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,6 +33,7 @@ Patch0: 0001-enable-shared.patch Patch1: 0003-startup-conf.patch Patch2: vpp-17.10-java9.patch +Patch3: vpp-18.01-nojavah.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -154,6 +155,7 @@ %patch0 %patch1 %patch2 -p1 +%patch3 -p1 %build export VPP_BUILD_USER=suse ++++++ vpp-18.01-nojavah.patch ++++++ --- vpp-18.01/src/configure.ac 2018-01-08 10:44:42.032124060 +0100 +++ vpp-18.01/src/configure.ac 2018-01-08 10:47:24.734893542 +0100 @@ -312,7 +312,6 @@ AX_VPP_FIND_JDK8 AC_SUBST(JAVA_HOME) AC_SUBST(JAVAC) - AC_SUBST(JAVAH) AC_SUBST(JAR) ]) --- vpp-18.01/src/vpp-api/java/Makefile.am 2018-01-08 10:44:42.040124060 +0100 +++ vpp-18.01/src/vpp-api/java/Makefile.am 2018-01-08 10:46:27.046893324 +0100 @@ -71,9 +71,7 @@ @echo " JAPIGEN $@" @rm -rf jvpp-registry/target @mkdir -p jvpp-registry/target - @$(JAVAC) -source 8 -target 8 -d jvpp-registry/target $^ - @$(JAVAH) -force -classpath jvpp-registry/target -d jvpp-registry io.fd.vpp.jvpp.VppJNIConnection - @$(JAVAH) -force -classpath jvpp-registry/target -d jvpp-registry io.fd.vpp.jvpp.JVppRegistryImpl + @$(JAVAC) -source 8 -target 8 -d jvpp-registry/target -h jvpp-registry $^ @touch jvpp-registry.ok define japigen @@ -84,10 +82,7 @@ @find jvpp-$(1)/target -name \*.java > jvpp-$(1).generated.files @find @srcdir@/jvpp-$(1) -name \*.java > jvpp-$(1).static.files @$(JAVAC) -source 8 -target 8 -classpath jvpp-registry/target \ - -d jvpp-$(1)/target @jvpp-$(1).generated.files @jvpp-$(1).static.files - @$(JAVAH) -force \ - -classpath jvpp-registry/target:jvpp-$(1)/target \ - -d jvpp-$(1) io.fd.vpp.jvpp.$(1).$(2) + -d jvpp-$(1)/target -h jvpp-$(1) @jvpp-$(1).generated.files @jvpp-$(1).static.files endef #
