diff options
| author |   Damjan Marion <damarion@cisco.com> | 2018-09-12 14:01:10 +0200 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2018-09-12 16:38:59 +0000 |
| commit | 79dcbc74cd417f4caf41bc398ccba94cab7d656b (patch) | |
| tree | 043a57b2a904636093ff08b44f97172d09c36114 /build-data/packages | |
| parent | 350155329c6075cef48b2d6934329a7ad75cf5c8 (diff) | |
Always use 'lib' instead of 'lib64'
It is packaging responsibility to put libs in the right place.
Use of lib64 resulted in huge amount of files with hardcoded lib64.
This patch simplifies things...
Change-Id: Iab0dea0583e480907732c5d2379eb951a00fa9e6
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'build-data/packages')
| -rw-r--r-- | build-data/packages/vom.mk | 5 | ||||
| -rw-r--r-- | build-data/packages/vpp.mk | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/build-data/packages/vom.mk b/build-data/packages/vom.mk index 84b5bca86dd..e7e02282db4 100644 --- a/build-data/packages/vom.mk +++ b/build-data/packages/vom.mk @@ -25,10 +25,7 @@ vom_cmake_args ?= vom_cmake_args += -DCMAKE_INSTALL_PREFIX:PATH=$(PACKAGE_INSTALL_DIR) vom_cmake_args += -DCMAKE_CXX_FLAGS="$($(TAG)_TAG_CPPFLAGS)" vom_cmake_args += -DCMAKE_SHARED_LINKER_FLAGS="$($(TAG)_TAG_LDFLAGS)" -vom_cmake_args += -DVPP_INCLUDE_DIR_HINT="$(PACKAGE_INSTALL_DIR)/../vpp/include" -vom_cmake_args += -DVPP_LIB_DIR_HINT="$(PACKAGE_INSTALL_DIR)/../vpp/lib64" -vom_cmake_args += -DCMAKE_INCLUDE_PATH="$(call installed_includes_fn, vpp)" -vom_cmake_args += -DCMAKE_LIBRARY_PATH="$(call installed_libs_fn, vpp)" +vom_cmake_args += -DCMAKE_PREFIX_PATH:PATH="$(PACKAGE_INSTALL_DIR)/../vpp" # Use devtoolset on centos 7 ifneq ($(wildcard /opt/rh/devtoolset-7/enable),) diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk index ae26e6dd244..9980c663666 100644 --- a/build-data/packages/vpp.mk +++ b/build-data/packages/vpp.mk @@ -23,8 +23,7 @@ vpp_cmake_args ?= vpp_cmake_args += -DCMAKE_INSTALL_PREFIX:PATH=$(PACKAGE_INSTALL_DIR) vpp_cmake_args += -DCMAKE_C_FLAGS="$($(TAG)_TAG_CFLAGS)" vpp_cmake_args += -DCMAKE_LINKER_FLAGS="$($(TAG)_TAG_LDFLAGS)" -vpp_cmake_args += -DDPDK_INCLUDE_DIR_HINT="$(PACKAGE_INSTALL_DIR)/../dpdk/include" -vpp_cmake_args += -DDPDK_LIB_DIR_HINT="$(PACKAGE_INSTALL_DIR)/../dpdk/lib" +vpp_cmake_args += -DCMAKE_PREFIX_PATH:PATH="$(PACKAGE_INSTALL_DIR)/../dpdk" # Use devtoolset on centos 7 ifneq ($(wildcard /opt/rh/devtoolset-7/enable),) |