filter pkgconfig output to force it do use our staging_dir and not
try to use the system libraries as it is inclined to do
This commit is contained in:
parent
ceb2859765
commit
4ac03cc86a
|
@ -88,7 +88,11 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
|
||||||
CPP=$(TARGET_CROSS)cpp \
|
CPP=$(TARGET_CROSS)cpp \
|
||||||
RANLIB=$(TARGET_CROSS)ranlib \
|
RANLIB=$(TARGET_CROSS)ranlib \
|
||||||
STRIP=$(TARGET_CROSS)strip \
|
STRIP=$(TARGET_CROSS)strip \
|
||||||
OBJCOPY=$(TARGET_CROSS)objcopy
|
OBJCOPY=$(TARGET_CROSS)objcopy \
|
||||||
|
CC_FOR_BUILD="$(HOSTCC)" \
|
||||||
|
PKG_CONFIG_SYSROOT=$(STAGING_DIR) \
|
||||||
|
PKG_CONFIG=$(STAGING_DIR)/usr/bin/pkg-config
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(BR2_ENABLE_LOCALE),y)
|
ifeq ($(BR2_ENABLE_LOCALE),y)
|
||||||
DISABLE_NLS:=
|
DISABLE_NLS:=
|
||||||
|
|
27
package/pkgconfig/pkgconfig-filter.sh
Executable file
27
package/pkgconfig/pkgconfig-filter.sh
Executable file
|
@ -0,0 +1,27 @@
|
||||||
|
#!/bin/bash
|
||||||
|
# filter the output from pkg-config (renamed as pkg-config.real)
|
||||||
|
# and ensures PKG_CONFIG_SYSROOT is prepended to all paths
|
||||||
|
|
||||||
|
CMD=$0
|
||||||
|
|
||||||
|
if [ ! "$PKG_CONFIG_SYSROOT" ]; then
|
||||||
|
echo "pkg-config-filter: missing \$PKG_CONFIG_SYSROOT environment variable"
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
|
||||||
|
export PKG_CONFIG_LIBDIR
|
||||||
|
export PKG_CONFIG_PATH
|
||||||
|
|
||||||
|
if $CMD.real $* |
|
||||||
|
sed -e "s~\-L/*$PKG_CONFIG_SYSROOT/*~-L=/~g; s~\-I/*$PKG_CONFIG_SYSROOT/*~-I=/~g;" |
|
||||||
|
sed -e "s~\-L/~-L=/~g; s~\-I/~-I=/~g;" |
|
||||||
|
sed -e "s~\-L\=~-L$PKG_CONFIG_SYSROOT~g; s~\-I\=~-I$PKG_CONFIG_SYSROOT~g;"
|
||||||
|
then
|
||||||
|
echo "PKG_CONFIG_LIBDIR=$PKG_CONFIG_LIBDIR" >&2
|
||||||
|
echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >&2
|
||||||
|
echo "OKAY" >&2;
|
||||||
|
exit 0;
|
||||||
|
else
|
||||||
|
echo "pkg-config failed!" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
|
@ -28,6 +28,7 @@ $(PKGCONFIG_DIR)/.configured: $(PKGCONFIG_DIR)/.unpacked
|
||||||
--exec-prefix=/usr \
|
--exec-prefix=/usr \
|
||||||
--bindir=/usr/bin \
|
--bindir=/usr/bin \
|
||||||
--sbindir=/usr/sbin \
|
--sbindir=/usr/sbin \
|
||||||
|
--libdir=/lib \
|
||||||
--libexecdir=/usr/lib \
|
--libexecdir=/usr/lib \
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--datadir=/usr/share \
|
--datadir=/usr/share \
|
||||||
|
@ -45,6 +46,9 @@ $(PKGCONFIG_DIR)/$(PKGCONFIG_BINARY): $(PKGCONFIG_DIR)/.configured
|
||||||
|
|
||||||
$(STAGING_DIR)/$(PKGCONFIG_TARGET_BINARY): $(PKGCONFIG_DIR)/$(PKGCONFIG_BINARY)
|
$(STAGING_DIR)/$(PKGCONFIG_TARGET_BINARY): $(PKGCONFIG_DIR)/$(PKGCONFIG_BINARY)
|
||||||
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(PKGCONFIG_DIR) install
|
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(PKGCONFIG_DIR) install
|
||||||
|
mv $(STAGING_DIR)/usr/bin/pkg-config $(STAGING_DIR)/usr/bin/pkg-config.real
|
||||||
|
cp package/pkgconfig/pkgconfig-filter.sh $(STAGING_DIR)/usr/bin/pkg-config
|
||||||
|
mkdir -p $(STAGING_DIR)/lib/pkgconfig
|
||||||
rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/usr/info \
|
rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/usr/info \
|
||||||
$(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc
|
$(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user