diff options
| author |   Andrew Yourtchenko <ayourtch@gmail.com> | 2020-09-28 12:14:51 +0000 |
|---|---|---|
| committer | Andrew Yourtchenko <ayourtch@gmail.com> | 2020-09-28 12:16:52 +0000 |
| commit | a0b1329aa66a66841f52b923693490f95d4fb1ef (patch) | |
| tree | b49648897269e58ee26fe975fc45730e0d8e9245 /build | |
| parent | c7b359ff538f53a974b88ab1447bef9736495f4f (diff) | |
dpdk: Revert "prevent linking dpdk against libbsd"
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
Diffstat (limited to 'build')
| -rw-r--r-- | build/external/packages/dpdk.mk | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/build/external/packages/dpdk.mk b/build/external/packages/dpdk.mk index 49761cd56a4..ef84383d55a 100644 --- a/build/external/packages/dpdk.mk +++ b/build/external/packages/dpdk.mk @@ -12,7 +12,6 @@ # limitations under the License. DPDK_PKTMBUF_HEADROOM ?= 128 -DPDK_USE_LIBBSD ?= n DPDK_DEBUG ?= n DPDK_MLX4_PMD ?= n DPDK_MLX5_PMD ?= n @@ -119,19 +118,6 @@ echo '$(HASH)define RTE_$(1) $(DPDK_$(1))' \ fi 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 = \ --default-library static \ --libdir lib \ @@ -157,8 +143,7 @@ define dpdk_config_cmds deactivate && \ echo "DPDK post meson configuration" && \ echo "Altering rte_build_config.h" && \ - $(call dpdk_config,PKTMBUF_HEADROOM) && \ - $(call dpdk_config_def,USE_LIBBSD) + $(call dpdk_config,PKTMBUF_HEADROOM) endef define dpdk_build_cmds |