Browse Source

Changed pkgconfig to also build on stage 0 when cross compiling to be sure to have PKG_CONFIG_SYSROOT_DIR support, and improved parse-config to export PKG_CONFIG_SYSROOT_DIR when needed

early
Alejandro Mery 17 years ago
parent
commit
d9bbb81b0c
  1. 8
      base/pkgconfig/parse-config
  2. 4
      base/pkgconfig/pkgconfig.conf
  3. 2
      base/pkgconfig/pkgconfig.desc

8
base/pkgconfig/parse-config

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../pkgconfig/parse-config
# Copyright (C) 2006 - 2007 The OpenSDE Project
# Copyright (C) 2006 - 2008 The OpenSDE Project
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
@ -15,12 +15,12 @@
if atstage cross; then
#export PKG_CONFIG_DEBUG_SPEW=yes
SYSROOT=$base/build/$SDECFG_ID
PKG_CONFIG_SYSROOT_DIR=$base/build/$SDECFG_ID
PKG_CONFIG_PATH=
for x in $SYSROOT/{usr,usr/X11*,usr/local,opt/*}/{lib,lib64,share}/pkgconfig; do
for x in $PKG_CONFIG_SYSROOT_DIR/{usr,usr/X11*,usr/local,opt/*}/{lib,lib64,share}/pkgconfig; do
[ -d "$x" ] && PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+$PKG_CONFIG_PATH:}$x"
done
export PKG_CONFIG_PATH
export PKG_CONFIG_SYSROOT_DIR
export PKG_CONFIG_LIBDIR=$PKG_CONFIG_PATH # needed, otherwse system is used
unset SYSROOT
fi

4
base/pkgconfig/pkgconfig.conf

@ -25,4 +25,6 @@ if atstage cross; then
var_append configcache ' ' 'ac_cv_func_getpwuid_r=yes'
fi
hook_add postmake 5 'cp -vf $confdir/etc_profile.d_pkgconfig.txt $root/etc/profile.d/pkgconfig'
if ! atstage toolchain; then
hook_add postmake 5 'cp -vf $confdir/etc_profile.d_pkgconfig.txt $root/etc/profile.d/pkgconfig'
fi

2
base/pkgconfig/pkgconfig.desc

@ -32,7 +32,7 @@
[L] GPL
[S] Stable
[V] 0.23
[P] X -?---5---9 105.000
[P] X ??---5---9 105.000
[D] 3704338130 pkg-config-0.23.tar.gz http://www.freedesktop.org/software/pkgconfig/releases/

Loading…
Cancel
Save