Commit 51173980 authored by Will Newton's avatar Will Newton
Browse files

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: default avatarWill Newton <will.newton@gmail.com>
parent bf5e693d

package/Makefile.in

+6 −3
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \ 
		DEFAULT_LINKER="$(TARGET_LD)" \

		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \

		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)"



TARGET_CONFIGURE_ENV=\
@@ -282,9 +282,12 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \ 
		ORIGINAL_NM_FOR_TARGET="$(TARGET_NM)" \

		ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)" \

		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

package/pango/pango.mk

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ $(STAMP_DIR)/host_pango_configured: $(STAMP_DIR)/host_pango_unpacked $(STAMP_DIR 
	touch $@



$(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 $@



$(STAMP_DIR)/host_pango_installed: $(STAMP_DIR)/host_pango_compiled