[vlc-devel] [PATCH] contrib: Make --disable-foo disable any package that depends on foo

[Martin Storsjö]

---
 contrib/src/main.mak | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 30a5e1f03a..b00534849a 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -437,6 +437,8 @@ PKGS_AUTOMATIC := $(filter-out $(PKGS_FOUND),$(PKGS))
 # Apply manual selection (from bootstrap):
 PKGS_MANUAL := $(sort $(PKGS_ENABLE) $(filter-out $(PKGS_DISABLE),$(PKGS_AUTOMATIC)))
 # Resolve dependencies:
+PKGS_DISABLE_TRANSITIVE := $(sort $(foreach p,$(PKGS_MANUAL),$(if $(filter $(PKGS_DISABLE),$(DEPS_$(p))),$(p))))
+PKGS_MANUAL := $(filter-out $(PKGS_DISABLE_TRANSITIVE),$(PKGS_MANUAL))
 PKGS_DEPS := $(filter-out $(PKGS_FOUND) $(PKGS_MANUAL),$(sort $(foreach p,$(PKGS_MANUAL),$(DEPS_$(p)))))
 PKGS := $(sort $(PKGS_MANUAL) $(PKGS_DEPS))
 
@@ -495,6 +497,8 @@ list:
 	@echo '  $(PKGS_AUTOMATIC)' | tr " " "\n" | sort | tr "\n" " " |fmt
 	@echo Manually deselected packages:
 	@echo '  $(PKGS_DISABLE)' | tr " " "\n" | sort | tr "\n" " " |fmt
+	@echo Transitively deselected packages:
+	@echo '  $(PKGS_DISABLE_TRANSITIVE)' | tr " " "\n" | sort | tr "\n" " " |fmt
 	@echo Manually selected packages:
 	@echo '  $(PKGS_ENABLE)' | tr " " "\n" | sort | tr "\n" " " |fmt
 	@echo Depended-on packages:
-- 
2.17.1