ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VPP-8: Set java-8 for JNI

Browse Source 
Change-Id: Ia81713a72e3c48b1d97bbf3f20a908bbc4ebd3b1
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
This commit is contained in:
Marek Gradzki
2016-04-26 08:01:31 +02:00
committed by Dave Barach
parent e0ef46b7c0
commit 60c63c7b53
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -22,7 +22,7 @@ MINIMAL_STARTUP_CONF="unix { interactive }"
GDB_ARGS= -ex "handle SIGUSR1 noprint nostop" GDB_ARGS= -ex "handle SIGUSR1 noprint nostop"
DEB_DEPENDS = curl build-essential autoconf automake bison libssl-dev ccache DEB_DEPENDS = curl build-essential autoconf automake bison libssl-dev ccache
DEB_DEPENDS += debhelper dkms default-jdk git libtool libganglia1-dev libapr1-dev dh-systemd DEB_DEPENDS += debhelper dkms openjdk-8-jdk git libtool libganglia1-dev libapr1-dev dh-systemd
DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
RPM_DEPENDS_GROUPS = 'Development Tools' RPM_DEPENDS_GROUPS = 'Development Tools'
@ -77,8 +77,19 @@ help:
@echo " PLATFORM = $(PLATFORM)" @echo " PLATFORM = $(PLATFORM)"
@echo " DPDK_VERSION = $(DPDK_VERSION)" @echo " DPDK_VERSION = $(DPDK_VERSION)"
# openjdk-8-jdk is not available in 14.04 repos by default
define use_ppa_for_jdk8
if [ "$(shell lsb_release -r | awk '{print $$2}')"=="14.04" ]; then \
sudo apt install software-properties-common; \
sudo add-apt-repository -y ppa:openjdk-r/ppa; \
sudo apt update; \
fi;
endef
$(BR)/.bootstrap.ok: $(BR)/.bootstrap.ok:
ifeq ("$(shell lsb_release -si)", "Ubuntu") ifeq ("$(shell lsb_release -si)", "Ubuntu")
$(use_ppa_for_jdk8)
@MISSING=$$(apt-get install -y -qq -s $(DEB_DEPENDS) | grep "^Inst ") ; \ @MISSING=$$(apt-get install -y -qq -s $(DEB_DEPENDS) | grep "^Inst ") ; \
if [ -n "$$MISSING" ] ; then \ if [ -n "$$MISSING" ] ; then \
echo "\nPlease install missing packages: \n$$MISSING\n" ; \ echo "\nPlease install missing packages: \n$$MISSING\n" ; \
@ -108,6 +119,7 @@ bootstrap: $(BR)/.bootstrap.ok
install-dep: install-dep:
ifeq ("$(shell lsb_release -si)", "Ubuntu") ifeq ("$(shell lsb_release -si)", "Ubuntu")
$(use_ppa_for_jdk8)
@sudo apt-get -y install $(DEB_DEPENDS) @sudo apt-get -y install $(DEB_DEPENDS)
else ifneq ("$(wildcard /etc/redhat-release)","") else ifneq ("$(wildcard /etc/redhat-release)","")
@sudo yum groupinstall -y $(RPM_DEPENDS_GROUPS) @sudo yum groupinstall -y $(RPM_DEPENDS_GROUPS)
@ -188,3 +200,4 @@ ctags: ctags.files
cscope: cscope.files cscope: cscope.files
@cscope -b -q -v @cscope -b -q -v

2
build-data/packages/vpp-api.mk
View File

@ -20,4 +20,4 @@ vpp-api_LDFLAGS = $(call installed_libs_fn, \
vlib \ vlib \
vlib-api) vlib-api)
vpp-api_CPPFLAGS += -I/usr/lib/jvm/java-7-openjdk-amd64/include vpp-api_CPPFLAGS += -I/usr/lib/jvm/java-8-openjdk-amd64/include