Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1431251 - Remove PKG_CONFIG_LIBDIR from mozconfigs. r=rillian

Browse Source 
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
This commit is contained in:
Mike Hommey 2018-01-27 11:49:23 +09:00
parent 7879ca12c1
commit e551e11340
13 changed files with 0 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/config/mozconfigs/linux32/debug-asan
View File

@ -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

4
browser/config/mozconfigs/linux32/nightly-asan
View File

@ -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

4
browser/config/mozconfigs/linux64/debug-asan
View File

@ -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

4
browser/config/mozconfigs/linux64/debug-searchfox-clang
View File

@ -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"

4
browser/config/mozconfigs/linux64/debug-static-analysis-clang
View File

@ -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"

4
browser/config/mozconfigs/linux64/hazards
View File

@ -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"

4
browser/config/mozconfigs/linux64/nightly-asan
View File

@ -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

4
browser/config/mozconfigs/linux64/nightly-asan-reporter
View File

@ -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

4
browser/config/mozconfigs/linux64/nightly-fuzzing-asan
View File

@ -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

4
browser/config/mozconfigs/linux64/opt-static-analysis-clang
View File

@ -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"

4
browser/config/mozconfigs/linux64/opt-tsan
View File

@ -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

5
build/unix/mozconfig.linux
View File

@ -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

4
build/unix/mozconfig.linux32
View File

@ -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"