diff options
Diffstat (limited to 'package/pkgconfig')
| -rw-r--r-- | package/pkgconfig/Config.in | 1 | ||||
| -rw-r--r-- | package/pkgconfig/pkgconfig.mk | 38 |
2 files changed, 18 insertions, 21 deletions
diff --git a/package/pkgconfig/Config.in b/package/pkgconfig/Config.in index 2e6ac7db1..cd2852df6 100644 --- a/package/pkgconfig/Config.in +++ b/package/pkgconfig/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PKGCONFIG bool "pkg-config" + select BR2_PACKAGE_LIBGLIB2 help pkg-config is a system for managing library compile/link flags that works with automake and autoconf. It replaces diff --git a/package/pkgconfig/pkgconfig.mk b/package/pkgconfig/pkgconfig.mk index 22ce1c799..00fd9582c 100644 --- a/package/pkgconfig/pkgconfig.mk +++ b/package/pkgconfig/pkgconfig.mk @@ -3,18 +3,23 @@ # pkgconfig # ############################################################# -PKGCONFIG_VERSION:=0.23 -PKGCONFIG_SOURCE:=pkg-config-$(PKGCONFIG_VERSION).tar.gz -PKGCONFIG_SITE:=http://pkgconfig.freedesktop.org/releases/ +PKGCONFIG_VERSION = 0.23 +PKGCONFIG_SOURCE = pkg-config-$(PKGCONFIG_VERSION).tar.gz +PKGCONFIG_SITE = http://pkgconfig.freedesktop.org/releases/ -# pkgconfig for the host -PKGCONFIG_HOST_DIR:=$(BUILD_DIR)/pkg-config-$(PKGCONFIG_VERSION)-host -PKGCONFIG_HOST_BINARY:=$(HOST_DIR)/usr/bin/pkg-config +ifeq ($(BR2_ENABLE_DEBUG),y) # install-exec doesn't install aclocal stuff +PKGCONFIG_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec +endif + +PKGCONFIG_DEPENDENCIES = uclibc libglib2 -$(DL_DIR)/$(PKGCONFIG_SOURCE): - $(call DOWNLOAD,$(PKGCONFIG_SITE),$(PKGCONFIG_SOURCE)) +PKGCONFIG_CONF_OPT = --with-installed-glib -pkgconfig-source: $(DL_DIR)/$(PKGCONFIG_SOURCE) +$(eval $(call AUTOTARGETS,package,pkgconfig)) + +# pkgconfig for the host +PKGCONFIG_HOST_DIR:=$(BUILD_DIR)/pkgconfig-$(PKGCONFIG_VERSION)-host +PKGCONFIG_HOST_BINARY:=$(HOST_DIR)/usr/bin/pkg-config $(PKGCONFIG_HOST_DIR)/.unpacked: $(DL_DIR)/$(PKGCONFIG_SOURCE) mkdir -p $(@D) @@ -39,21 +44,12 @@ $(PKGCONFIG_HOST_DIR)/.compiled: $(PKGCONFIG_HOST_DIR)/.configured $(PKGCONFIG_HOST_BINARY): $(PKGCONFIG_HOST_DIR)/.compiled $(MAKE) -C $(<D) install -host-pkgconfig pkgconfig: $(PKGCONFIG_HOST_BINARY) +host-pkgconfig: $(PKGCONFIG_HOST_BINARY) -host-pkgconfig-clean pkgconfig-clean: +host-pkgconfig-clean: rm -f $(addprefix $(PKGCONFIG_HOST_DIR)/,.unpacked .configured .compiled) -$(MAKE) -C $(PKGCONFIG_HOST_DIR) uninstall -$(MAKE) -C $(PKGCONFIG_HOST_DIR) clean -host-pkgconfig-dirclean pkgconfig-dirclean: +host-pkgconfig-dirclean: rm -rf $(PKGCONFIG_HOST_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_PKGCONFIG),y) -TARGETS+=pkgconfig -endif |