File vpp-18.01-nojavah.patch of Package vpp

Overview Repositories Revisions Requests Users Attributes Meta

File vpp-18.01-nojavah.patch of Package vpp

--- 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
 
 #

Places

File vpp-18.01-nojavah.patch of Package vpp

Places