NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkgconfig: install into HOST_DIR

Browse Source
This commit is contained in:
Peter Korsgaard 2009-03-18 19:18:40 +00:00
parent 396480b41d
commit b451015203
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/Makefile.in
View File

@ -251,7 +251,7 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
DEFAULT_ASSEMBLER="$(TARGET_AS)" \ DEFAULT_ASSEMBLER="$(TARGET_AS)" \
DEFAULT_LINKER="$(TARGET_LD)" \ DEFAULT_LINKER="$(TARGET_LD)" \
PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \ PKG_CONFIG="$(PKGCONFIG_HOST_BINARY)" \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
STAGING_DIR="$(STAGING_DIR)" STAGING_DIR="$(STAGING_DIR)"
@ -296,7 +296,7 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
ORIGINAL_LD_FOR_TARGET="$(TARGET_LD)" \ ORIGINAL_LD_FOR_TARGET="$(TARGET_LD)" \
ORIGINAL_NM_FOR_TARGET="$(TARGET_NM)" \ ORIGINAL_NM_FOR_TARGET="$(TARGET_NM)" \
ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)" \ ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)" \
PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \ PKG_CONFIG="$(PKGCONFIG_HOST_BINARY)" \
PKG_CONFIG_PATH="$(HOST_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" PKG_CONFIG_PATH="$(HOST_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)"
HOST_MAKE_ENV=PATH=$(HOST_PATH) HOST_MAKE_ENV=PATH=$(HOST_PATH)

23
package/pkgconfig/pkgconfig.mk
View File

@ -9,7 +9,7 @@ PKGCONFIG_SITE:=http://pkgconfig.freedesktop.org/releases/
PKGCONFIG_DIR:=$(BUILD_DIR)/pkg-config-$(PKGCONFIG_VERSION) PKGCONFIG_DIR:=$(BUILD_DIR)/pkg-config-$(PKGCONFIG_VERSION)
PKGCONFIG_CAT:=$(ZCAT) PKGCONFIG_CAT:=$(ZCAT)
PKGCONFIG_BINARY:=pkg-config PKGCONFIG_BINARY:=pkg-config
PKGCONFIG_TARGET_BINARY:=usr/bin/pkg-config PKGCONFIG_HOST_BINARY:=$(HOST_DIR)/usr/bin/pkg-config
$(DL_DIR)/$(PKGCONFIG_SOURCE): $(DL_DIR)/$(PKGCONFIG_SOURCE):
$(call DOWNLOAD,$(PKGCONFIG_SITE),$(PKGCONFIG_SOURCE)) $(call DOWNLOAD,$(PKGCONFIG_SITE),$(PKGCONFIG_SOURCE))
@ -24,28 +24,27 @@ $(PKGCONFIG_DIR)/.unpacked: $(DL_DIR)/$(PKGCONFIG_SOURCE)
$(PKGCONFIG_DIR)/.configured: $(PKGCONFIG_DIR)/.unpacked $(PKGCONFIG_DIR)/.configured: $(PKGCONFIG_DIR)/.unpacked
(cd $(PKGCONFIG_DIR); rm -rf config.cache; \ (cd $(PKGCONFIG_DIR); rm -rf config.cache; \
./configure \ ./configure \
--prefix=/usr \ --prefix=$(HOST_DIR)/usr \
--sysconfdir=/etc \ --sysconfdir=$(HOST_DIR)/etc \
--with-pc-path="$(STAGING_DIR)/usr/lib/pkgconfig" \ --with-pc-path="$(STAGING_DIR)/usr/lib/pkgconfig" \
$(DISABLE_NLS) \ --disable-static \
$(DISABLE_LARGEFILE) \
) )
touch $@ touch $@
$(PKGCONFIG_DIR)/$(PKGCONFIG_BINARY): $(PKGCONFIG_DIR)/.configured $(PKGCONFIG_DIR)/$(PKGCONFIG_BINARY): $(PKGCONFIG_DIR)/.configured
$(MAKE) -C $(PKGCONFIG_DIR) $(MAKE) -C $(PKGCONFIG_DIR)
$(STAGING_DIR)/$(PKGCONFIG_TARGET_BINARY): $(PKGCONFIG_DIR)/$(PKGCONFIG_BINARY) $(PKGCONFIG_HOST_BINARY): $(PKGCONFIG_DIR)/$(PKGCONFIG_BINARY)
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(PKGCONFIG_DIR) install $(MAKE) -C $(PKGCONFIG_DIR) install
rm -rf $(STAGING_DIR)/usr/share/man
pkgconfig: uclibc $(STAGING_DIR)/$(PKGCONFIG_TARGET_BINARY) host-pkgconfig pkgconfig: $(PKGCONFIG_HOST_BINARY)
pkgconfig-clean: host-pkgconfig-clean pkgconfig-clean:
-$(MAKE) DESTDIR=$(STAGING_DIR) -C $(PKGCONFIG_DIR) uninstall rm -f $(addprefix $(PKGCONFIG_DIR)/,.unpacked .configured .compiled)
-$(MAKE) -C $(PKGCONFIG_DIR) uninstall
-$(MAKE) -C $(PKGCONFIG_DIR) clean -$(MAKE) -C $(PKGCONFIG_DIR) clean
pkgconfig-dirclean: host-pkgconfig-dirclean pkgconfig-dirclean:
rm -rf $(PKGCONFIG_DIR) rm -rf $(PKGCONFIG_DIR)
############################################################# #############################################################