Bug 1491647 - Fix mozconfig.gtk and mozconfig.linux.common to detect pkgconfig. r=bustagefix
authorEdmund Wong <ewong@pw-wspx.org>
Sun, 16 Sep 2018 16:43:45 +0800
changeset 33162 0d6094a42d38d24e7443a86f4f0006b8b8e730a4
parent 33161 d0a694c28bf8646db77f58c39e3ac3bc65b3764c
child 33163 13445f1444562f2e4ed891c91c68eb26d2e3c744
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersbustagefix
bugs1491647
Bug 1491647 - Fix mozconfig.gtk and mozconfig.linux.common to detect pkgconfig. r=bustagefix
suite/config/mozconfigs/mozconfig.gtk
--- a/suite/config/mozconfigs/mozconfig.gtk
+++ b/suite/config/mozconfigs/mozconfig.gtk
@@ -1,16 +1,16 @@
 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="${PKG_CONFIG_PATH}:$TOOLTOOL_DIR/gtk3/usr/local/bin/pkg-config"
+export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:$TOOLTOOL_DIR/gtk3/usr/local/lib/pkgconfig"
+PKG_CONFIG_PATH="${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}"
 ac_add_options --enable-default-toolkit=cairo-gtk3
 
 # Set things up to use Gtk+3 from the tooltool package
 mk_add_options "export FONTCONFIG_PATH=$TOOLTOOL_DIR/gtk3/usr/local/etc/fonts"
 mk_add_options "export PANGO_SYSCONFDIR=$TOOLTOOL_DIR/gtk3/usr/local/etc"