Browse Source

Changed pkgconfig to support share/pkgconfig - cleaned and taken maintainship

early
Alejandro Mery 17 years ago
parent
commit
d2a721ee56
  1. 21
      base/pkgconfig/etc_profile.d_pkgconfig.txt
  2. 8
      base/pkgconfig/parse-config
  3. 17
      base/pkgconfig/pkgconfig.conf
  4. 3
      base/pkgconfig/pkgconfig.desc

21
base/pkgconfig/etc_profile.d_pkgconfig.txt

@ -0,0 +1,21 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../pkgconfig/pkgconfig.conf
# Copyright (C) 2006 - 2007 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
# set the PKG_CONFIG_PATH variable
#
PKG_CONFIG_PATH=
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"
done
export PKG_CONFIG_PATH

8
base/pkgconfig/parse-config

@ -2,6 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# T2 SDE: package/.../pkgconfig/parse-config
# Copyright (C) 2006 - 2007 The OpenSDE Project
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
@ -15,10 +16,9 @@
if atstage cross; then
#export PKG_CONFIG_DEBUG_SPEW=yes
SYSROOT=$base/build/$SDECFG_ID
PKG_CONFIG_PATH=$SYSROOT/usr/lib/pkgconfig # unused, due below
for x in $SYSROOT/usr/lib64 $SYSROOT/usr/X11*/lib{,64} \
$SYSROOT/opt/*/lib{,64}; do
[ -d $x/pkgconfig ] && PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$x/pkgconfig"
PKG_CONFIG_PATH=
for x in $SYSROOT/{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_LIBDIR=$PKG_CONFIG_PATH # needed, otherwse system is used

17
base/pkgconfig/pkgconfig.conf

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../pkgconfig/pkgconfig.conf
# Copyright (C) 2006 The OpenSDE Project
# Copyright (C) 2006 - 2007 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -12,17 +12,4 @@
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
pkgconfig_profile() {
cat <<-EOT > $root/etc/profile.d/$pkg
# set the PKG_CONFIG_PATH variable
#
PKG_CONFIG_PATH="/usr/lib/pkgconfig"
for x in /usr/lib64 /usr/X11*/lib{,64} /usr/local/lib{,64} /opt/*/lib{,64} \
\$HOME/lib{,64} ; do
[ -d \$x/pkgconfig ] && PKG_CONFIG_PATH="\$PKG_CONFIG_PATH:\$x/pkgconfig"
done
export PKG_CONFIG_PATH
EOT
}
hook_add postmake 5 'pkgconfig_profile'
hook_add postmake 5 'cp -vf $confdir/etc_profile.d_pkgconfig.txt $root/etc/profile.d/pkgconfig'

3
base/pkgconfig/pkgconfig.desc

@ -25,13 +25,12 @@
[A] James Henstridge <james@daa.com.au>
[A] Havoc Pennington <hp@redhat.com> {Maintainer}
[M] The OpenSDE Community <list@opensde.org>
[M] Alejandro Mrry <amery@opensde.org>
[C] base/tool
[L] GPL
[S] Stable
[V] 0.22
[P] X -----5---9 105.000

Loading…
Cancel
Save