public_mirrors
/
buildroot
mirror of https://github.com/godotengine/buildroot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

package/Makefile.in: Use appropriate paths for host pkg-config. 

PKG_CONFIG_PATH adds a path to the pkg-config search path, but this is not
enough when we are building host tools - the host pkg-config default path
is still used, and this will pick up .pc files in the staging_dir tree.

PKG_CONFIG_LIBDIR overrides the pkg-config default path and ensures only
host .pc files are found. This fixes a pango build failure when building
for the host with cairo PNG support enabled.

Signed-off-by: Will Newton <will.newton@gmail.com>
This commit is contained in:
Will Newton 2009-08-25 13:03:33 +01:00
parent bf5e693d75
commit 51173980cd
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/Makefile.in
View File

@ -237,7 +237,7 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
DEFAULT_LINKER="$(TARGET_LD)" \ DEFAULT_LINKER="$(TARGET_LD)" \
PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ PKG_CONFIG="$(PKG_CONFIG_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)"
TARGET_CONFIGURE_ENV=\ TARGET_CONFIGURE_ENV=\
@ -282,9 +282,12 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
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="$(PKG_CONFIG_HOST_BINARY)" \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
PKG_CONFIG_PATH="$(HOST_DIR)/usr/lib/pkgconfig$(PKG_CONFIG_PATH)" PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig"
HOST_MAKE_ENV=PATH=$(HOST_PATH) \
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig"
HOST_MAKE_ENV=PATH=$(HOST_PATH)
####################################################################### #######################################################################
# settings we need to pass to configure # settings we need to pass to configure

2
package/pango/pango.mk
View File

@ -91,7 +91,7 @@ $(STAMP_DIR)/host_pango_configured: $(STAMP_DIR)/host_pango_unpacked $(STAMP_DIR
touch $@ touch $@
$(STAMP_DIR)/host_pango_compiled: $(STAMP_DIR)/host_pango_configured $(STAMP_DIR)/host_pango_compiled: $(STAMP_DIR)/host_pango_configured
$(HOST_MAKE_ENV) PKG_CONFIG_PATH="$(HOST_DIR)/usr/lib/pkgconfig$(PKG_CONFIG_PATH)" $(MAKE) -C $(PANGO_HOST_DIR) $(HOST_MAKE_ENV) $(MAKE) -C $(PANGO_HOST_DIR)
touch $@ touch $@
$(STAMP_DIR)/host_pango_installed: $(STAMP_DIR)/host_pango_compiled $(STAMP_DIR)/host_pango_installed: $(STAMP_DIR)/host_pango_compiled