From e551e1134037349e6bd7d067423f0f11f3251be1 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Sat, 27 Jan 2018 11:49:23 +0900 Subject: [PATCH] Bug 1431251 - Remove PKG_CONFIG_LIBDIR from mozconfigs. r=rillian As of bug 1430036 it was only set when building on CentOS, and as of bug 1432398, we don't have CentOS-based docker images anymore. --HG-- extra : rebase_source : 5ade9bee773bca3283cfdb9d69209033fe82253f --- browser/config/mozconfigs/linux32/debug-asan | 4 ---- browser/config/mozconfigs/linux32/nightly-asan | 4 ---- browser/config/mozconfigs/linux64/debug-asan | 4 ---- browser/config/mozconfigs/linux64/debug-searchfox-clang | 4 ---- .../config/mozconfigs/linux64/debug-static-analysis-clang | 4 ---- browser/config/mozconfigs/linux64/hazards | 4 ---- browser/config/mozconfigs/linux64/nightly-asan | 4 ---- browser/config/mozconfigs/linux64/nightly-asan-reporter | 4 ---- browser/config/mozconfigs/linux64/nightly-fuzzing-asan | 4 ---- browser/config/mozconfigs/linux64/opt-static-analysis-clang | 4 ---- browser/config/mozconfigs/linux64/opt-tsan | 4 ---- build/unix/mozconfig.linux | 5 ----- build/unix/mozconfig.linux32 | 4 ---- 13 files changed, 53 deletions(-) diff --git a/browser/config/mozconfigs/linux32/debug-asan b/browser/config/mozconfigs/linux32/debug-asan index 8bc377619dd9..72acc89c1d86 100644 --- a/browser/config/mozconfigs/linux32/debug-asan +++ b/browser/config/mozconfigs/linux32/debug-asan @@ -10,10 +10,6 @@ ac_add_options --enable-valgrind . $topsrcdir/build/unix/mozconfig.asan -if [ -f /etc/redhat-release ]; then -export PKG_CONFIG_LIBDIR=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig -fi - # Enable Telemetry export MOZ_TELEMETRY_REPORTING=1 diff --git a/browser/config/mozconfigs/linux32/nightly-asan b/browser/config/mozconfigs/linux32/nightly-asan index b0c07010f477..629457c34cfc 100644 --- a/browser/config/mozconfigs/linux32/nightly-asan +++ b/browser/config/mozconfigs/linux32/nightly-asan @@ -9,10 +9,6 @@ ac_add_options --enable-valgrind . $topsrcdir/build/unix/mozconfig.asan -if [ -f /etc/redhat-release ]; then -export PKG_CONFIG_LIBDIR=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig -fi - # Package js shell. export MOZ_PACKAGE_JSSHELL=1 diff --git a/browser/config/mozconfigs/linux64/debug-asan b/browser/config/mozconfigs/linux64/debug-asan index 7bcc151a0dda..72acc89c1d86 100644 --- a/browser/config/mozconfigs/linux64/debug-asan +++ b/browser/config/mozconfigs/linux64/debug-asan @@ -10,10 +10,6 @@ ac_add_options --enable-valgrind . $topsrcdir/build/unix/mozconfig.asan -if [ -f /etc/redhat-release ]; then -export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig -fi - # Enable Telemetry export MOZ_TELEMETRY_REPORTING=1 diff --git a/browser/config/mozconfigs/linux64/debug-searchfox-clang b/browser/config/mozconfigs/linux64/debug-searchfox-clang index 5f1a5b013164..866fddfae921 100644 --- a/browser/config/mozconfigs/linux64/debug-searchfox-clang +++ b/browser/config/mozconfigs/linux64/debug-searchfox-clang @@ -19,8 +19,4 @@ ac_add_options --enable-mozsearch-plugin . "$topsrcdir/build/unix/mozconfig.stdcxx" -if [ -f /etc/redhat-release ]; then -export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig -fi - . "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux64/debug-static-analysis-clang b/browser/config/mozconfigs/linux64/debug-static-analysis-clang index fb5aa2e0ec96..8ecd647cb15c 100644 --- a/browser/config/mozconfigs/linux64/debug-static-analysis-clang +++ b/browser/config/mozconfigs/linux64/debug-static-analysis-clang @@ -18,8 +18,4 @@ ac_add_options --enable-clang-plugin . "$topsrcdir/build/unix/mozconfig.stdcxx" -if [ -f /etc/redhat-release ]; then -export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig -fi - . "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux64/hazards b/browser/config/mozconfigs/linux64/hazards index def1d0b2977f..a0bf65882c22 100644 --- a/browser/config/mozconfigs/linux64/hazards +++ b/browser/config/mozconfigs/linux64/hazards @@ -40,8 +40,4 @@ CFLAGS="$CFLAGS -Wno-attributes" CPPFLAGS="$CPPFLAGS -Wno-attributes" CXXFLAGS="$CXXFLAGS -Wno-attributes" -if [ -f /etc/redhat-release ]; then -export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig -fi - . "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux64/nightly-asan b/browser/config/mozconfigs/linux64/nightly-asan index 5983768f5f74..15bf38d6c054 100644 --- a/browser/config/mozconfigs/linux64/nightly-asan +++ b/browser/config/mozconfigs/linux64/nightly-asan @@ -9,10 +9,6 @@ ac_add_options --enable-valgrind . $topsrcdir/build/unix/mozconfig.asan -if [ -f /etc/redhat-release ]; then -export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig -fi - # Package js shell. export MOZ_PACKAGE_JSSHELL=1 diff --git a/browser/config/mozconfigs/linux64/nightly-asan-reporter b/browser/config/mozconfigs/linux64/nightly-asan-reporter index 6dd16f4509aa..3512ae9b5519 100644 --- a/browser/config/mozconfigs/linux64/nightly-asan-reporter +++ b/browser/config/mozconfigs/linux64/nightly-asan-reporter @@ -11,10 +11,6 @@ ac_add_options --enable-valgrind ac_add_options --enable-address-sanitizer-reporter -if [ -f /etc/redhat-release ]; then -export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig -fi - # Need this to prevent name conflicts with the normal nightly build packages export MOZ_PKG_SPECIAL=asan-reporter diff --git a/browser/config/mozconfigs/linux64/nightly-fuzzing-asan b/browser/config/mozconfigs/linux64/nightly-fuzzing-asan index f25021853294..0ee0278251da 100644 --- a/browser/config/mozconfigs/linux64/nightly-fuzzing-asan +++ b/browser/config/mozconfigs/linux64/nightly-fuzzing-asan @@ -17,10 +17,6 @@ ac_add_options --enable-valgrind ac_add_options --enable-fuzzing unset MOZ_STDCXX_COMPAT -if [ -f /etc/redhat-release ]; then -export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig -fi - # Package js shell. export MOZ_PACKAGE_JSSHELL=1 diff --git a/browser/config/mozconfigs/linux64/opt-static-analysis-clang b/browser/config/mozconfigs/linux64/opt-static-analysis-clang index 335d404475df..3b7df063d16a 100644 --- a/browser/config/mozconfigs/linux64/opt-static-analysis-clang +++ b/browser/config/mozconfigs/linux64/opt-static-analysis-clang @@ -17,8 +17,4 @@ ac_add_options --enable-clang-plugin . "$topsrcdir/build/unix/mozconfig.stdcxx" -if [ -f /etc/redhat-release ]; then -export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig -fi - . "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux64/opt-tsan b/browser/config/mozconfigs/linux64/opt-tsan index 62e879c4f88a..c8de7cce854b 100644 --- a/browser/config/mozconfigs/linux64/opt-tsan +++ b/browser/config/mozconfigs/linux64/opt-tsan @@ -1,9 +1,5 @@ . $topsrcdir/build/unix/mozconfig.tsan -if [ -f /etc/redhat-release ]; then -export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig -fi - # Need this to prevent name conflicts with the normal nightly build packages export MOZ_PKG_SPECIAL=tsan diff --git a/build/unix/mozconfig.linux b/build/unix/mozconfig.linux index 443d7c287839..b5da799acd20 100644 --- a/build/unix/mozconfig.linux +++ b/build/unix/mozconfig.linux @@ -25,8 +25,3 @@ else 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 diff --git a/build/unix/mozconfig.linux32 b/build/unix/mozconfig.linux32 index d74249fad060..b9ac630c5f78 100644 --- a/build/unix/mozconfig.linux32 +++ b/build/unix/mozconfig.linux32 @@ -1,9 +1,5 @@ . "$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"