From: Mohammed Hawari Date: Thu, 2 Feb 2023 12:29:28 +0000 (+0100) Subject: build: allow skipping external-deps X-Git-Tag: v23.10-rc0~252 X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=9db6db065a78003d5105a660d3e8ddf0cf889d16;p=vpp.git build: allow skipping external-deps Change-Id: I0e5090ec6978af0dc4baecc7654918cf40663f42 Signed-off-by: Mohammed Hawari Type: feature --- diff --git a/build/external/deb/debian/rules b/build/external/deb/debian/rules index cf4b4d989b4..901d4689766 100755 --- a/build/external/deb/debian/rules +++ b/build/external/deb/debian/rules @@ -26,6 +26,7 @@ override_dh_auto_configure: override_dh_install: make $(MAKE_ARGS) install + @mkdir -p $(INSTALL_DIR) dh_install -p$(PKG) --autodest /opt override_dh_shlibdeps: diff --git a/build/external/packages.mk b/build/external/packages.mk index 99322ae3bef..b969d8fc5e7 100644 --- a/build/external/packages.mk +++ b/build/external/packages.mk @@ -101,11 +101,18 @@ define $1_config_cmds endef endif +ifneq ($(filter $1,$(VPP_SKIP_EXTERNAL)), $1) $(B)/.$1.config.ok: $(B)/.$1.patch.ok $(addsuffix -install,$($1_depends)) $$(call h1,"configuring $1 $($1_version) - log: $$($1_config_log)") @mkdir -p $$($1_build_dir) $$(call $1_config_cmds) @touch $$@ +else +$(B)/.$1.config.ok: + $$(call h1,"Skipping $1 $($1_version)") + @mkdir -p $(B) + @touch $$@ +endif .PHONY: $1-config $1-config: $(B)/.$1.config.ok @@ -120,10 +127,17 @@ define $1_build_cmds endef endif +ifneq ($(filter $1,$(VPP_SKIP_EXTERNAL)), $1) $(B)/.$1.build.ok: $(B)/.$1.config.ok $$(call h1,"building $1 $($1_version) - log: $$($1_build_log)") $$(call $1_build_cmds) @touch $$@ +else +$(B)/.$1.build.ok: + $$(call h1,"Skipping $1 $($1_version)") + @mkdir -p $(B) + @touch $$@ +endif .PHONY: $1-build $1-build: $(B)/.$1.build.ok @@ -138,10 +152,17 @@ define $1_install_cmds endef endif +ifneq ($(filter $1,$(VPP_SKIP_EXTERNAL)), $1) $(B)/.$1.install.ok: $(B)/.$1.build.ok $$(call h1,"installing $1 $($1_version) - log: $$($1_install_log)") $$(call $1_install_cmds) @touch $$@ +else +$(B)/.$1.install.ok: + $$(call h1,"Skipping $1 $($1_version)") + @mkdir -p $(B) + @touch $$@ +endif .PHONY: $1-install $1-install: $(B)/.$1.install.ok