From 112aa092bd1b19afa34b3e887830155aa39eab48 Mon Sep 17 00:00:00 2001 From: Adrien Beraud <adrien.beraud@savoirfairelinux.com> Date: Sun, 18 Jun 2017 23:15:08 +0200 Subject: [PATCH] contrib: use pkg-static on all pkg-config files Use pkg-static to convert all generated .pc files. That is because every contrib package is statically built, however when the libring library is built, pkg-config is not called with the --static flag. It's done by adding an additional target in main.mak. pkg-static can be safely run multiple times on the same file. Change-Id: I2e5c47e793ed5516dd3c8aa0446077bfc945adcb --- contrib/src/main.mak | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/src/main.mak b/contrib/src/main.mak index e7931e09a3..103a1be6c6 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -393,9 +393,11 @@ PKGS_MANUAL := $(sort $(PKGS_ENABLE) $(filter-out $(PKGS_DISABLE),$(PKGS_AUTOMAT PKGS_DEPS := $(filter-out $(PKGS_FOUND) $(PKGS_MANUAL),$(sort $(foreach p,$(PKGS_MANUAL),$(DEPS_$(p))))) PKGS := $(sort $(PKGS_MANUAL) $(PKGS_DEPS)) +convert-static: + for p in $(PREFIX)/lib/pkgconfig/*.pc; do $(SRC)/pkg-static.sh $$p; done fetch: $(PKGS:%=.sum-%) fetch-all: $(PKGS_ALL:%=.sum-%) -install: $(PKGS:%=.%) +install: $(PKGS:%=.%) convert-static mostlyclean: -$(RM) $(foreach p,$(PKGS_ALL),.$(p) .sum-$(p) .dep-$(p)) -- GitLab