Bug 1484403 - Need to point pkg-config to the installed libpulse et. al libs. r=frg
This commit is contained in:
Родитель
d1bac1ccc1
Коммит
a72ef5ac7e
|
@ -1,13 +1,11 @@
|
|||
TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
|
||||
|
||||
# $TOOLTOOL_DIR/gtk3 comes from tooltool, and must be included in the tooltool manifest.
|
||||
TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir} # $TOOLTOOL_DIR/gtk3 comes from tooltool, and must be included in the tooltool manifest.
|
||||
if [ -z "$PKG_CONFIG_LIBDIR" ]; then
|
||||
echo PKG_CONFIG_LIBDIR must be set >&2
|
||||
exit 1
|
||||
fi
|
||||
export PKG_CONFIG_SYSROOT_DIR="$TOOLTOOL_DIR/gtk3"
|
||||
export PKG_CONFIG_PATH="$TOOLTOOL_DIR/gtk3/usr/local/lib/pkgconfig"
|
||||
PKG_CONFIG="$TOOLTOOL_DIR/gtk3/usr/local/bin/pkg-config"
|
||||
PKG_CONFIG="${PKG_CONFIG_PATH}:$TOOLTOOL_DIR/gtk3/usr/local/bin/pkg-config"
|
||||
export PATH="$TOOLTOOL_DIR/gtk3/usr/local/bin:${PATH}"
|
||||
# Ensure cairo, gdk-pixbuf, etc. are not taken from the system installed packages.
|
||||
LDFLAGS="-L$TOOLTOOL_DIR/gtk3/usr/local/lib ${LDFLAGS}"
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# Common statements that are applicable to both Linux32 and Linux64.
|
||||
|
||||
export PKG_CONFIG_PAHT="${PKG_CONFIG_PATH}:/usr/lib64/pkgconfig:/usr/lib/pkgconfig"
|
||||
# Due to bug 1426785, we need to re-include mozconfig.gtk with our
|
||||
# linux* builders.
|
||||
. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.gtk
|
||||
|
|
Загрузка…
Ссылка в новой задаче