Backed out changeset fb09e4b27ed4 (Port bug 1431251: Remove PKG_CONFIG_LIBDIR from mozconfigs); rs=bustage-fix
authorTom Prince <mozilla@hocat.ca>
Tue, 30 Jan 2018 09:21:32 -0700
changeset 31002 262a2523f4d34f2318f740297fd8ff3e9c9727c4
parent 31001 27bb4a90e0a83c36fd054b63459516307aa4e1fa
child 31003 788f8c59020238eadec121c35d9b2a755f66d2e2
push id383
push userclokep@gmail.com
push dateMon, 07 May 2018 21:52:48 +0000
reviewersbustage-fix
bugs1431251
backs outfb09e4b27ed4cff576ea837a5829b1e0b47a7d6b
Backed out changeset fb09e4b27ed4 (Port bug 1431251: Remove PKG_CONFIG_LIBDIR from mozconfigs); rs=bustage-fix
build/unix/mozconfig.linux
build/unix/mozconfig.linux32
--- a/build/unix/mozconfig.linux
+++ b/build/unix/mozconfig.linux
@@ -20,8 +20,13 @@ then
   # package.
   mk_add_options "export PATH=$TOOLTOOL_DIR/gcc/bin:$PATH"
 else
   CC="/tools/gcc-4.7.3-0moz1/bin/gcc"
   CXX="/tools/gcc-4.7.3-0moz1/bin/g++"
 fi
 
 . "$topsrcdir/build/unix/mozconfig.stdcxx"
+
+if [ -f /etc/redhat-release ]; then
+# PKG_CONFIG_LIBDIR is appropriately overridden in mozconfig.linux32
+export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
+fi
--- a/build/unix/mozconfig.linux32
+++ b/build/unix/mozconfig.linux32
@@ -1,10 +1,14 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
 
+if [ -f /etc/redhat-release ]; then
+export PKG_CONFIG_LIBDIR=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
+fi
+
 export MOZ_LINUX_32_SSE2_STARTUP_ERROR=1
 
 CFLAGS="$CFLAGS -msse -msse2 -mfpmath=sse"
 CXXFLAGS="$CXXFLAGS -msse -msse2 -mfpmath=sse"
 
 if test `uname -m` = "x86_64"; then
   CC="$CC -m32 -march=pentium-m"
   CXX="$CXX -m32 -march=pentium-m"