From 15c4583c5177549dc13a1941cf5194b0ebb4f8b7 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 27 Feb 2018 15:35:30 +1100 Subject: [PATCH] glib: use native pkgconf --- src/glib.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/glib.mk b/src/glib.mk index a6dea81a..18de0635 100644 --- a/src/glib.mk +++ b/src/glib.mk @@ -51,8 +51,9 @@ define $(PKG)_BUILD_DARWIN --disable-dtrace \ --disable-libmount \ --with-pcre=internal \ - CPPFLAGS='-I$(BUILD_DIR).usr/include -I$(PREFIX)/$(TARGET)/include' \ - LDFLAGS='-L$(BUILD_DIR).usr/lib -L$(PREFIX)/$(TARGET)/lib -lffi' + PKG_CONFIG='$(PREFIX)/$(TARGET)/bin/pkgconf' \ + CPPFLAGS='-I$(BUILD_DIR).usr/include' \ + LDFLAGS='-L$(BUILD_DIR).usr/lib' $(MAKE) -C '$(BUILD_DIR)/glib' -j '$(JOBS)' $(MAKE) -C '$(BUILD_DIR)/gthread' -j '$(JOBS)' $(MAKE) -C '$(BUILD_DIR)/gmodule' -j '$(JOBS)' @@ -80,6 +81,7 @@ define $(PKG)_BUILD_NATIVE --disable-libmount \ --with-libiconv=gnu \ --with-pcre=internal \ + PKG_CONFIG='$(PREFIX)/$(TARGET)/bin/pkgconf' \ CPPFLAGS='-I$(PREFIX)/$(TARGET)/include' \ LDFLAGS='-L$(PREFIX)/$(TARGET)/lib' $(SED) -i 's,#define G_ATOMIC.*,,' '$(BUILD_DIR)/config.h'