Hello community,
here is the log from the commit of package vpp for openSUSE:Factory checked in
at 2017-10-30 21:19:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vpp (Old)
and /work/SRC/openSUSE:Factory/.vpp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vpp"
Mon Oct 30 21:19:09 2017 rev:5 rq:537518 version:17.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/vpp/vpp.changes 2017-10-27 14:00:50.921623560
+0200
+++ /work/SRC/openSUSE:Factory/.vpp.new/vpp.changes 2017-10-30
21:19:16.749464329 +0100
@@ -1,0 +2,9 @@
+Mon Oct 30 09:35:55 UTC 2017 - fst...@suse.com
+
+- Added patch:
+ * vpp-17.10-java9.patch
+ - Specify java source and target level 8 in order to make the
+ java code buildable with jdk9
+- Don't require java-1_8_0-openjdk-devel, but java-devel >= 1.8
+
+-------------------------------------------------------------------
New:
----
vpp-17.10-java9.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vpp.spec ++++++
--- /var/tmp/diff_new_pack.O9RClw/_old 2017-10-30 21:19:17.861423901 +0100
+++ /var/tmp/diff_new_pack.O9RClw/_new 2017-10-30 21:19:17.865423755 +0100
@@ -32,6 +32,7 @@
Source0: %{name}-%{version}-release.tar.xz
Patch0: 0001-enable-shared.patch
Patch1: 0003-startup-conf.patch
+Patch2: vpp-17.10-java9.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
@@ -42,7 +43,7 @@
BuildRequires: dpdk-devel => 17.08
BuildRequires: gcc
BuildRequires: glibc-devel-static
-BuildRequires: java-1_8_0-openjdk-devel
+BuildRequires: java-devel >= 1.8
BuildRequires: libnuma-devel
BuildRequires: libopenssl-devel
BuildRequires: libtool
@@ -148,6 +149,7 @@
%setup -q -n %{name}-%{version}
%patch0
%patch1
+%patch2 -p1
%build
export VPP_BUILD_USER=suse
++++++ vpp-17.10-java9.patch ++++++
--- vpp-17.10/src/vpp-api/java/Makefile.am 2017-09-27 23:11:15.000000000
+0200
+++ vpp-17.10/src/vpp-api/java/Makefile.am 2017-10-25 12:21:08.566668254
+0200
@@ -71,7 +71,7 @@
@echo " JAPIGEN $@"
@rm -rf jvpp-registry/target
@mkdir -p jvpp-registry/target
- @$(JAVAC) -d 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
@touch jvpp-registry.ok
@@ -83,7 +83,7 @@
-i $(jvpp_$(1)_json_files) > /dev/null
@find jvpp-$(1)/target -name \*.java > jvpp-$(1).generated.files
@find @srcdir@/jvpp-$(1) -name \*.java > jvpp-$(1).static.files
- @$(JAVAC) -classpath jvpp-registry/target \
+ @$(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 \
