From c2ba6b7aa96108c54a05ba198380ead8c5c7d892 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 30 Jul 2015 08:24:05 +0900 Subject: [PATCH] Bug 1186748 - Switch hazard and root analysis builds to Gtk+3. r=mshal --- browser/config/mozconfigs/linux64/hazards | 1 + .../tooltool-manifests/linux64/clang.manifest | 7 +++ build/unix/mozconfig.gtk | 48 ++++++++++--------- .../devtools/rootAnalysis/build/gcc.manifest | 7 +++ 4 files changed, 40 insertions(+), 23 deletions(-) diff --git a/browser/config/mozconfigs/linux64/hazards b/browser/config/mozconfigs/linux64/hazards index 6c5e19373284..ebe46ccb82ef 100644 --- a/browser/config/mozconfigs/linux64/hazards +++ b/browser/config/mozconfigs/linux64/hazards @@ -26,6 +26,7 @@ CFLAGS="$CFLAGS -Wno-attributes" CPPFLAGS="$CPPFLAGS -Wno-attributes" CXXFLAGS="$CXXFLAGS -Wno-attributes" +TOOLTOOL_DIR="$(dirname $topsrcdir)" export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig . $topsrcdir/build/unix/mozconfig.gtk diff --git a/browser/config/tooltool-manifests/linux64/clang.manifest b/browser/config/tooltool-manifests/linux64/clang.manifest index 216b4eae7037..ba2d63fe998d 100644 --- a/browser/config/tooltool-manifests/linux64/clang.manifest +++ b/browser/config/tooltool-manifests/linux64/clang.manifest @@ -8,5 +8,12 @@ "algorithm": "sha512", "filename": "clang.tar.bz2", "unpack": true +}, +{ +"size": 4431740, +"digest": "68fc56b0fb0cdba629b95683d6649ff76b00dccf97af90960c3d7716f6108b2162ffd5ffcd5c3a60a21b28674df688fe4dabc67345e2da35ec5abeae3d48c8e3", +"algorithm": "sha512", +"filename": "gtk3.tar.xz", +"unpack": true } ] diff --git a/build/unix/mozconfig.gtk b/build/unix/mozconfig.gtk index fd92daf3fa4d..c49f0e4a4db8 100644 --- a/build/unix/mozconfig.gtk +++ b/build/unix/mozconfig.gtk @@ -1,41 +1,43 @@ -# $topsrcdir/gtk3 comes from tooltool, when the tooltool manifest contains it. -if [ -d "$topsrcdir/gtk3" ]; then +TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir} + +# $TOOLTOOL_DIR/gtk3 comes from tooltool, when the tooltool manifest contains it. +if [ -d "$TOOLTOOL_DIR/gtk3" ]; then if [ -z "$PKG_CONFIG_LIBDIR" ]; then echo PKG_CONFIG_LIBDIR must be set >&2 exit 1 fi - 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}" + export PKG_CONFIG_SYSROOT_DIR="$TOOLTOOL_DIR/gtk3" + export PKG_CONFIG_PATH="$TOOLTOOL_DIR/gtk3/usr/local/lib/pkgconfig" + export PATH="$TOOLTOOL_DIR/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 ${LDFLAGS}" - mk_add_options "export LD_LIBRARY_PATH=$topsrcdir/gtk3/usr/local/lib" + LDFLAGS="-L$TOOLTOOL_DIR/gtk3/usr/local/lib ${LDFLAGS}" + mk_add_options "export LD_LIBRARY_PATH=$TOOLTOOL_DIR/gtk3/usr/local/lib" 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=$topsrcdir/gtk3/usr/local/etc/fonts" - mk_add_options "export PANGO_SYSCONFDIR=$topsrcdir/gtk3/usr/local/etc" - mk_add_options "export PANGO_LIBDIR=$topsrcdir/gtk3/usr/local/lib" - mk_add_options "export GDK_PIXBUF_MODULE_FILE=$topsrcdir/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" - mk_add_options "export GDK_PIXBUF_MODULEDIR=$topsrcdir/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders" - mk_add_options "export LD_LIBRARY_PATH=$topsrcdir/gtk3/usr/local/lib" + 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" + mk_add_options "export PANGO_LIBDIR=$TOOLTOOL_DIR/gtk3/usr/local/lib" + mk_add_options "export GDK_PIXBUF_MODULE_FILE=$TOOLTOOL_DIR/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" + mk_add_options "export GDK_PIXBUF_MODULEDIR=$TOOLTOOL_DIR/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders" + mk_add_options "export LD_LIBRARY_PATH=$TOOLTOOL_DIR/gtk3/usr/local/lib" - # pango expects absolute paths in pango.modules, and topsrcdir may vary... - LD_LIBRARY_PATH=$topsrcdir/gtk3/usr/local/lib \ - PANGO_SYSCONFDIR=$topsrcdir/gtk3/usr/local/etc \ - PANGO_LIBDIR=$topsrcdir/gtk3/usr/local/lib \ - $topsrcdir/gtk3/usr/local/bin/pango-querymodules > $topsrcdir/gtk3/usr/local/etc/pango/pango.modules + # pango expects absolute paths in pango.modules, and TOOLTOOL_DIR may vary... + LD_LIBRARY_PATH=$TOOLTOOL_DIR/gtk3/usr/local/lib \ + PANGO_SYSCONFDIR=$TOOLTOOL_DIR/gtk3/usr/local/etc \ + PANGO_LIBDIR=$TOOLTOOL_DIR/gtk3/usr/local/lib \ + $TOOLTOOL_DIR/gtk3/usr/local/bin/pango-querymodules > $TOOLTOOL_DIR/gtk3/usr/local/etc/pango/pango.modules # same with gdb-pixbuf and loaders.cache - LD_LIBRARY_PATH=$topsrcdir/gtk3/usr/local/lib \ - GDK_PIXBUF_MODULE_FILE=$topsrcdir/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ - GDK_PIXBUF_MODULEDIR=$topsrcdir/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders \ - $topsrcdir/gtk3/usr/local/bin/gdk-pixbuf-query-loaders > $topsrcdir/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache + LD_LIBRARY_PATH=$TOOLTOOL_DIR/gtk3/usr/local/lib \ + GDK_PIXBUF_MODULE_FILE=$TOOLTOOL_DIR/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ + GDK_PIXBUF_MODULEDIR=$TOOLTOOL_DIR/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders \ + $TOOLTOOL_DIR/gtk3/usr/local/bin/gdk-pixbuf-query-loaders > $TOOLTOOL_DIR/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache # mock build environment doesn't have fonts in /usr/share/fonts, but # has some in /usr/share/X11/fonts. Add this directory to the # fontconfig configuration without changing the gtk3 tooltool package. - cat << EOF > $topsrcdir/gtk3/usr/local/etc/fonts/local.conf + cat << EOF > $TOOLTOOL_DIR/gtk3/usr/local/etc/fonts/local.conf diff --git a/js/src/devtools/rootAnalysis/build/gcc.manifest b/js/src/devtools/rootAnalysis/build/gcc.manifest index 6686b39d0f0b..7dcd080f3092 100644 --- a/js/src/devtools/rootAnalysis/build/gcc.manifest +++ b/js/src/devtools/rootAnalysis/build/gcc.manifest @@ -8,5 +8,12 @@ "algorithm": "sha512", "filename": "gcc.tar.xz", "unpack": true +}, +{ +"size": 4431740, +"digest": "68fc56b0fb0cdba629b95683d6649ff76b00dccf97af90960c3d7716f6108b2162ffd5ffcd5c3a60a21b28674df688fe4dabc67345e2da35ec5abeae3d48c8e3", +"algorithm": "sha512", +"filename": "gtk3.tar.xz", +"unpack": true } ]