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

dpdk: Revert "prevent linking dpdk against libbsd"

Browse Source 
This reverts commit 7a7601795171665eb71461c705f3fbb4b6c6f1ad.

After discussion with Damjan, the change is more risky than it seemed,
so revert.

Type: fix
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
Change-Id: I67defb01a0bebb8ff4231c27690b694f608fcb8e
This commit is contained in:
Andrew Yourtchenko
2020-09-28 12:14:51 +00:00
parent c7b359ff53
commit a0b1329aa6
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build/external/packages/dpdk.mk vendored
View File

@ -12,7 +12,6 @@
# limitations under the License. # limitations under the License.
DPDK_PKTMBUF_HEADROOM ?= 128 DPDK_PKTMBUF_HEADROOM ?= 128
DPDK_USE_LIBBSD ?= n
DPDK_DEBUG ?= n DPDK_DEBUG ?= n
DPDK_MLX4_PMD ?= n DPDK_MLX4_PMD ?= n
DPDK_MLX5_PMD ?= n DPDK_MLX5_PMD ?= n
@ -119,19 +118,6 @@ echo '$(HASH)define RTE_$(1) $(DPDK_$(1))' \
fi fi
endef endef
define dpdk_config_def
if [[ "$(DPDK_$(1))" == "y" ]]; then \
if ! grep -q "RTE_$(1)" $(dpdk_build_dir)/rte_build_config.h \
$(dpdk_src_dir)/config/rte_config.h ; then \
echo '$(HASH)define RTE_$(1) 1' \
>> $(dpdk_build_dir)/rte_build_config.h ; \
fi; \
elif [[ "$(DPDK_$(1))" == "n" ]]; then \
sed -i '/$(HASH)define RTE_$(1) .*/d' $(dpdk_build_dir)/rte_build_config.h \
$(dpdk_src_dir)/config/rte_config.h ; \
fi
endef
DPDK_MESON_ARGS = \ DPDK_MESON_ARGS = \
--default-library static \ --default-library static \
--libdir lib \ --libdir lib \
@ -157,8 +143,7 @@ define dpdk_config_cmds
deactivate && \ deactivate && \
echo "DPDK post meson configuration" && \ echo "DPDK post meson configuration" && \
echo "Altering rte_build_config.h" && \ echo "Altering rte_build_config.h" && \
$(call dpdk_config,PKTMBUF_HEADROOM) && \ $(call dpdk_config,PKTMBUF_HEADROOM)
$(call dpdk_config_def,USE_LIBBSD)
endef endef
define dpdk_build_cmds define dpdk_build_cmds