aboutsummaryrefslogtreecommitdiffstats
path: root/build-data/packages
diff options
context:
space:
mode:
authorDamjan Marion <dmarion@me.com>2018-09-27 18:02:28 +0000
committerFlorin Coras <florin.coras@gmail.com>2018-09-27 20:00:43 +0000
commit09cce66888f622af285e92ae05f76462a5a6d3b5 (patch)
tree61c0c1629d4d53e336594f35d86ce5e6369c4940 /build-data/packages
parent430420fbbade8a45671cac5ab8f3ba7a70fe4434 (diff)
Revert "japi: Move Java API binding to cmake"
components: Development CMake Error at /usr/share/cmake-3.10/Modules/FindPackageHandleStandardArgs.cmake:137 (message): Could NOT find JNI (missing: JAVA_AWT_INCLUDE_PATH) Call Stack (most recent call first): /usr/share/cmake-3.10/Modules/FindPackageHandleStandardArgs.cmake:378 (_FPHSA_FAILURE_MESSAGE) /usr/share/cmake-3.10/Modules/FindJNI.cmake:310 (FIND_PACKAGE_HANDLE_STANDARD_ARGS) CMakeLists.txt:37 (find_package) -- Configuring incomplete, errors occurred! See also "/scratch/vpp-tmp/build-root/build-vpp-native/japi/CMakeFiles/CMakeOutput.log". See also "/scratch/vpp-tmp/build-root/build-vpp-native/japi/CMakeFiles/CMakeError.log". Makefile:640: recipe for target 'japi-configure' failed make[2]: *** [japi-configure] Error 1 make[2]: Leaving directory '/scratch/vpp-tmp/build-root' This reverts commit a33db2528485ac39e8987bec7b138dbdad21dc5a. Change-Id: I8a818ce70a8379656c1134432e22db418a4690fe Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'build-data/packages')
-rw-r--r--build-data/packages/japi.mk42
1 files changed, 2 insertions, 40 deletions
diff --git a/build-data/packages/japi.mk b/build-data/packages/japi.mk
index a9df1fcb336..d6435930f4a 100644
--- a/build-data/packages/japi.mk
+++ b/build-data/packages/japi.mk
@@ -1,44 +1,6 @@
-# Copyright (c) 2017-2018 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
japi_configure_depend = vpp-install
japi_source = extras
japi_configure_subdir = japi
+japi_CPPFLAGS = $(call installed_includes_fn, vpp) $(call installed_includes_fn, vpp)/vpp_plugins
+japi_LDFLAGS = $(call installed_libs_fn, vpp)
-ifneq ($(shell which cmake3),)
-CMAKE?=cmake3
-else
-CMAKE?=cmake
-endif
-
-japi_cmake_args ?=
-japi_cmake_args += -DCMAKE_INSTALL_PREFIX:PATH=$(PACKAGE_INSTALL_DIR)
-japi_cmake_args += -DCMAKE_C_FLAGS="$($(TAG)_TAG_CFLAGS)"
-japi_cmake_args += -DCMAKE_SHARED_LINKER_FLAGS="$($(TAG)_TAG_LDFLAGS)"
-japi_cmake_args += -DCMAKE_PREFIX_PATH:PATH="$(PACKAGE_INSTALL_DIR)/../vpp"
-ifeq ("$(V)","1")
-japi_cmake_args += -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
-endif
-
-#Use devtoolset on centos 7
-ifneq ($(wildcard /opt/rh/devtoolset-7/enable),)
-japi_cmake_args += -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-7/root/bin"
-endif
-
-japi_configure = \
- cd $(PACKAGE_BUILD_DIR) && \
- $(CMAKE) -G Ninja $(japi_cmake_args) $(call find_source_fn,$(PACKAGE_SOURCE))$(PACKAGE_SUBDIR)
-
-japi_build = $(CMAKE) --build $(PACKAGE_BUILD_DIR) -- $(MAKE_PARALLEL_FLAGS)
-
-japi_install = $(CMAKE) --build $(PACKAGE_BUILD_DIR) -- install