Browse Source

pkgconfig: enhanced to also consider .pc files from prefix= so hal can find volume_id

cross
Alejandro Mery 16 years ago
parent
commit
46dd13448c
  1. 4
      base/pkgconfig/etc_profile.d_pkgconfig.txt
  2. 4
      base/pkgconfig/parse-config

4
base/pkgconfig/etc_profile.d_pkgconfig.txt

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../pkgconfig/etc_profile.d_pkgconfig.txt # Filename: package/.../pkgconfig/etc_profile.d_pkgconfig.txt
# Copyright (C) 2006 - 2007 The OpenSDE Project # Copyright (C) 2006 - 2009 The OpenSDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
# #
@ -15,7 +15,7 @@
# set the PKG_CONFIG_PATH variable # set the PKG_CONFIG_PATH variable
# #
PKG_CONFIG_PATH= PKG_CONFIG_PATH=
for x in {/usr,/usr/X11*,/usr/local,/opt/*,$HOME}/{lib,lib64,share}/pkgconfig; do for x in {,/usr,/usr/X11*,/usr/local,/opt/*,$HOME}/{lib,lib64,share}/pkgconfig; do
[ -d "$x" ] && PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+$PKG_CONFIG_PATH:}$x" [ -d "$x" ] && PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+$PKG_CONFIG_PATH:}$x"
done done
export PKG_CONFIG_PATH export PKG_CONFIG_PATH

4
base/pkgconfig/parse-config

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../pkgconfig/parse-config # Filename: package/.../pkgconfig/parse-config
# Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2006 - 2009 The OpenSDE Project
# Copyright (C) 2006 The T2 SDE Project # Copyright (C) 2006 The T2 SDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
@ -17,7 +17,7 @@ if atstage cross; then
#export PKG_CONFIG_DEBUG_SPEW=yes #export PKG_CONFIG_DEBUG_SPEW=yes
PKG_CONFIG_SYSROOT_DIR=$base/build/$SDECFG_ID PKG_CONFIG_SYSROOT_DIR=$base/build/$SDECFG_ID
PKG_CONFIG_PATH= PKG_CONFIG_PATH=
for x in $PKG_CONFIG_SYSROOT_DIR/{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" [ -d "$x" ] && PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+$PKG_CONFIG_PATH:}$x"
done done
export PKG_CONFIG_PATH export PKG_CONFIG_PATH

Loading…
Cancel
Save