Skip to content

Commit d4d6133

Browse files
dwallacelfdwallacelf
committed
build: revert "fix pkgconfig path for vpp-ext-deps package"
Reason for revert: breaks make install-ext-deps, see https://lists.fd.io/g/vpp-dev/topic/116663717#msg26615 Type: fix Fixes: c2bf6b6. Change-Id: Iadaa08f57de2859e3e77a1105540ce1dfc004f64 Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
1 parent c504991 commit d4d6133

8 files changed

Lines changed: 26 additions & 47 deletions

File tree

‎.gitignore‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,37 +21,29 @@
2121
/build-root/test-coverage*/
2222
/build-root/test/
2323
/build-config.mk
24-
/build/.ccache
25-
/build/.cmake
26-
/build/build.ninja
27-
/build/cmake*
28-
/build/CMakeCache.txt
29-
/build/CMakeFiles
3024
/build/external/*.tar.gz
3125
/build/external/*.tar.xz
26+
/build/external/vpp-*
27+
/build/external/dpdk_mlx_default.sh
28+
/build/external/downloads/
3229
/build/external/deb/_build/
33-
/build/external/deb/debian/.debhelper/
3430
/build/external/deb/debian/changelog
3531
/build/external/deb/debian/debhelper-build-stamp
36-
/build/external/deb/debian/files
37-
/build/external/deb/debian/files/
3832
/build/external/deb/debian/tmp/
33+
/build/external/deb/debian/files/
34+
/build/external/deb/debian/.debhelper/
3935
/build/external/deb/debian/vpp-ext-deps*
40-
/build/external/downloads/
41-
/build/external/dpdk_mlx_default.sh
42-
/build/external/vpp-*
36+
/build/optional/downloads/
4337
/build/optional/*.tar.gz
4438
/build/optional/*.tar.xz
39+
/build/optional/vpp-*
4540
/build/optional/deb/_build/
46-
/build/optional/deb/debian/.debhelper/
4741
/build/optional/deb/debian/changelog
4842
/build/optional/deb/debian/debhelper-build-stamp
49-
/build/optional/deb/debian/files/
5043
/build/optional/deb/debian/tmp/
44+
/build/optional/deb/debian/files/
45+
/build/optional/deb/debian/.debhelper/
5146
/build/optional/deb/debian/vpp-ext-deps*
52-
/build/optional/downloads/
53-
/build/optional/vpp-*
54-
/build/startup.conf
5547
/path_setup
5648
/tools/
5749
# start autotools ignore

‎build/build_common.mk‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ DL_CACHE_DIR = $(HOME)/Downloads
2121
MAKE_ARGS ?= -j
2222
BUILD_DIR ?= $(CURDIR)/_build
2323
INSTALL_DIR ?= $(CURDIR)/_install
24-
ROOT_DIR ?= $(DESTDIR)
2524
DOWNLOAD_DIR ?= $(CURDIR)/downloads
2625
PKG_VERSION ?= $(shell git describe --abbrev=0 --match 'v[0-9]*' | cut -d- -f1 | cut -dv -f2 | cut -d. -f1,2)
2726
SOURCE_DATE_EPOCH ?= $(shell git log -1 --pretty=%ct .)
@@ -34,7 +33,6 @@ endif # FreeBSD
3433

3534
B := $(BUILD_DIR)
3635
I := $(INSTALL_DIR)
37-
R := $(ROOT_DIR)
3836
D := $(DOWNLOAD_DIR)
3937
ifeq ($(WORKSPACE),)
4038
L := $(B)

‎build/external/deb/debian/rules‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ VERSION = $(shell dpkg-parsechangelog | sed -nr '/^Version:/s/Version: //p')
1010
BASE_VER = $(word 1, $(subst -, ,$(VERSION)))
1111

1212
export BUILD_DIR=$(CURDIR)/_build
13-
export INSTALL_DIR=/opt/vpp/external/$(shell uname -m)/
14-
export DESTDIR=$(CURDIR)/debian/tmp
13+
export INSTALL_DIR=$(CURDIR)/debian/tmp/opt/vpp/external/$(shell uname -m)/
1514

1615
MAKE_ARGS=-C ..
1716

@@ -27,12 +26,8 @@ override_dh_auto_configure:
2726

2827
override_dh_install:
2928
make $(MAKE_ARGS) install
30-
@mkdir -p $(DESTDIR)/$(INSTALL_DIR)
31-
@mkdir -p $(DESTDIR)/etc/ld.so.conf.d/
32-
@echo "$(INSTALL_DIR)/lib" > $(DESTDIR)/etc/ld.so.conf.d/vpp.conf
33-
@echo "$(INSTALL_DIR)/lib64" >> $(DESTDIR)/etc/ld.so.conf.d/vpp.conf
34-
dh_install -p$(PKG) --autodest /etc
29+
@mkdir -p $(INSTALL_DIR)
3530
dh_install -p$(PKG) --autodest /opt
3631

3732
override_dh_shlibdeps:
38-
dh_shlibdeps -l$(DESTDIR)/$(INSTALL_DIR)lib/:$(DESTDIR)/$(INSTALL_DIR)lib64/
33+
dh_shlibdeps -l$(INSTALL_DIR)lib/:$(INSTALL_DIR)lib64

‎build/external/packages/dpdk.mk‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,6 @@ DPDK_MESON_ARGS = \
180180
--libdir lib \
181181
--prefix $(dpdk_install_dir) \
182182
-Dtests=false \
183-
-Dc_args="-I$(dpdk_root_dir)/$(dpdk_install_dir)/include" \
184-
-Dc_link_args="-L$(dpdk_root_dir)/$(dpdk_install_dir)/lib" \
185183
-Denable_driver_sdk=true \
186184
"-Ddisable_drivers=$(DPDK_DRIVERS_DISABLED)" \
187185
"-Ddisable_libs=$(DPDK_LIBS_DISABLED)" \
@@ -203,7 +201,10 @@ define dpdk_config_cmds
203201
source ../dpdk-meson-venv/bin/activate && \
204202
(if ! ls $(PIP_DOWNLOAD_DIR)meson* ; then pip3 download -d $(PIP_DOWNLOAD_DIR) -f $(DL_CACHE_DIR) meson==0.57.2 setuptools wheel pyelftools; fi) && \
205203
pip3 install --no-index --find-links=$(PIP_DOWNLOAD_DIR) meson==0.57.2 pyelftools && \
206-
meson setup $(dpdk_src_dir) $(dpdk_build_dir) $(DPDK_MESON_ARGS) | tee $(dpdk_config_log) && \
204+
PKG_CONFIG_PATH=$(dpdk_install_dir)/lib/pkgconfig meson setup $(dpdk_src_dir) \
205+
$(dpdk_build_dir) \
206+
$(DPDK_MESON_ARGS) \
207+
| tee $(dpdk_config_log) && \
207208
deactivate && \
208209
echo "DPDK post meson configuration" && \
209210
echo "Altering rte_build_config.h" && \
@@ -226,7 +227,7 @@ define dpdk_install_cmds
226227
cd $(dpdk_build_dir) && \
227228
source ../dpdk-meson-venv/bin/activate && \
228229
meson install && \
229-
cd $(dpdk_root_dir)/$(dpdk_install_dir)/lib && \
230+
cd $(dpdk_install_dir)/lib && \
230231
echo "GROUP ( $$(ls librte*.a ) )" > libdpdk.a && \
231232
rm -rf librte*.so librte*.so.* dpdk/*/librte*.so dpdk/*/librte*.so.* && \
232233
deactivate

‎build/external/packages/ipsec-mb.mk‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ define ipsec-mb_build_cmds
3232
SAFE_PARAM=n \
3333
SAFE_LOOKUP=n \
3434
SAFE_DATA=n \
35-
PREFIX=$(ipsec-mb_root_dir)/$(ipsec-mb_install_dir) \
35+
PREFIX=$(ipsec-mb_install_dir) \
3636
EXTRA_CFLAGS="-g -msse4.2" > $(ipsec-mb_build_log)
3737
endef
3838

@@ -52,14 +52,10 @@ define ipsec-mb_install_cmds
5252
exit 1; \
5353
fi \
5454
fi
55-
@$(MAKE) -C $(ipsec-mb_src_dir)/lib install \
56-
V=1 \
57-
NOLDCONFIG=y \
58-
SHARED=n \
59-
SAFE_PARAM=n \
60-
SAFE_LOOKUP=n \
61-
SAFE_DATA=n \
62-
PREFIX=$(ipsec-mb_root_dir)/$(ipsec-mb_install_dir) >> $(ipsec-mb_install_log)
55+
@mkdir -p $(ipsec-mb_install_dir)/include
56+
@mkdir -p $(ipsec-mb_install_dir)/lib
57+
@cp $(ipsec-mb_src_dir)/lib/intel-ipsec-mb.h $(ipsec-mb_install_dir)/include
58+
@cp $(ipsec-mb_src_dir)/lib/libIPSec_MB.a $(ipsec-mb_install_dir)/lib
6359
endef
6460

6561
$(eval $(call package,ipsec-mb))

‎build/external/packages/rdma-core.mk‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ define rdma-core_config_cmds
3939
cd $(rdma-core_build_dir) && \
4040
$(CMAKE) -G Ninja $(rdma-core_src_dir) \
4141
-DENABLE_STATIC=1 -DENABLE_RESOLVE_NEIGH=0 -DNO_PYVERBS=1 -DENABLE_VALGRIND=0\
42-
-DCMAKE_BUILD_TYPE=$(RDMA_BUILD_TYPE) \
43-
-DCMAKE_INSTALL_PREFIX=$(rdma-core_install_dir) \
44-
-DCMAKE_INSTALL_SYSCONFDIR=/etc/vpp \
42+
-DCMAKE_BUILD_TYPE=$(RDMA_BUILD_TYPE) -DCMAKE_INSTALL_PREFIX=$(rdma-core_install_dir) \
4543
-DCMAKE_INSTALL_LIBDIR=lib \
4644
-DCMAKE_INSTALL_RUNDIR:PATH=/run \
4745
-DCMAKE_C_FLAGS='-fPIC' -DNO_MAN_PAGES=ON | tee $(rdma-core_config_log)

‎build/external/packages/xdp-tools.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ define xdp-tools_config_cmds
2525
endef
2626

2727
define xdp-tools_build_cmds
28-
@cd ${xdp-tools_src_dir} && $(MAKE) CC=gcc V=1 BUILD_STATIC_ONLY=y PREFIX='$(xdp-tools_install_dir)' > $(xdp-tools_build_log)
28+
@cd ${xdp-tools_src_dir} && $(MAKE) CC=gcc V=1 BUILD_STATIC_ONLY=y > $(xdp-tools_build_log)
2929
endef
3030

3131
define xdp-tools_install_cmds
3232
@rm -f $(xdp-tools_install_log)
3333
@cd ${xdp-tools_src_dir} && \
34-
$(MAKE) -C lib/libbpf/src install V=1 BUILD_STATIC_ONLY=y PREFIX='$(xdp-tools_install_dir)' >> $(xdp-tools_install_log)
34+
$(MAKE) -C lib/libbpf/src install V=1 BUILD_STATIC_ONLY=y PREFIX='' DESTDIR='$(xdp-tools_install_dir)' >> $(xdp-tools_install_log)
3535
@cd ${xdp-tools_src_dir} && \
36-
$(MAKE) -C lib/libxdp install V=1 BUILD_STATIC_ONLY=y PREFIX='$(xdp-tools_install_dir)' >> $(xdp-tools_install_log)
36+
$(MAKE) libxdp_install V=1 BUILD_STATIC_ONLY=y PREFIX='' DESTDIR='$(xdp-tools_install_dir)' >> $(xdp-tools_install_log)
3737
endef
3838

3939
$(eval $(call package,xdp-tools))

‎build/packages_common.mk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ $1_src_dir ?= $(B)/src-$1
2121
$1_patch_dir ?= $(CURDIR)/patches/$1_$($1_version)
2222
$1_build_dir ?= $(B)/build-$1
2323
$1_install_dir ?= $(I)
24-
$1_root_dir ?= $(R)
2524
$1_config_log ?= $(L)/$1.config.log
2625
$1_build_log ?= $(L)/$1.build.log
2726
$1_install_log ?= $(L)/$1.install.log

0 commit comments

Comments
 (0)