author | Mike Hommey <mh+mozilla@glandium.org> |
Tue, 24 Jun 2014 07:28:32 +0900 | |
changeset 190349 | 89fb025810acf31202f2b56d35d71d4d2323d342 |
parent 190348 | 8d2002e67d131de4466228cb0a7db604f59cbbe8 |
child 190350 | 253c1e5bf4c7c8ba519bb06d8a1f8ef975a7ff6c |
push id | 27004 |
push user | emorley@mozilla.com |
push date | Tue, 24 Jun 2014 15:52:34 +0000 |
treeherder | mozilla-central@7b174d47f3cc [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mshal |
bugs | 1016641 |
milestone | 33.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/build/unix/mozconfig.linux +++ b/build/unix/mozconfig.linux @@ -21,8 +21,21 @@ else CC="/tools/gcc-4.7.3-0moz1/bin/gcc" CXX="/tools/gcc-4.7.3-0moz1/bin/g++" fi ac_add_options --enable-elf-hack # Avoid dependency on libstdc++ 4.7 ac_add_options --enable-stdcxx-compat + +# $topsrcdir/gtk3 comes from tooltool, when the tooltool manifest contains it. +if [ -d "$topsrcdir/gtk3" ]; then + # PKG_CONFIG_LIBDIR is appropriately overridden in mozconfig.linux32 + export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig + export PKG_CONFIG_SYSROOT_DIR="$topsrcdir/gtk3" + export PKG_CONFIG_PATH="$topsrcdir/gtk3/usr/local/lib/pkgconfig" + export PATH="$topsrcdir/gtk3/usr/local/bin:${PATH}" + # Ensure cairo, gdk-pixbuf, etc. are not taken from the system installed packages. + LDFLAGS="-L$topsrcdir/gtk3/usr/local/lib" + mk_add_options "export LD_LIBRARY_PATH=$topsrcdir/gtk3/usr/local/lib" + ac_add_options --enable-default-toolkit=cairo-gtk3 +fi