From 91cfe286b81f9e6c35b9865efc578f6ae3098881 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Thu, 30 Jul 2015 11:52:49 -0400 Subject: [PATCH] Backed out changeset ada6cd4da281 (bug 1186748) for introducing various intermittent ASAN mochitest failures. --- .../linux32/releng.manifest | 7 --- .../linux64/releng.manifest | 7 --- browser/config/mozconfigs/linux64/hazards | 1 - .../tooltool-manifests/linux64/asan.manifest | 7 --- .../tooltool-manifests/linux64/clang.manifest | 7 --- build/unix/mozconfig.gtk | 48 +++++++++---------- .../devtools/rootAnalysis/build/gcc.manifest | 7 --- 7 files changed, 23 insertions(+), 61 deletions(-) diff --git a/b2g/config/tooltool-manifests/linux32/releng.manifest b/b2g/config/tooltool-manifests/linux32/releng.manifest index 79bbfa10a65..604e98b09cd 100644 --- a/b2g/config/tooltool-manifests/linux32/releng.manifest +++ b/b2g/config/tooltool-manifests/linux32/releng.manifest @@ -7,13 +7,6 @@ "unpack": true }, { -"size": 4079256, -"digest": "bb5238558bcf6db2ca395513c8dccaa15dd61b3c375598eb6a685356b0c1a2d9840e3bf81bc00242b872fd798541f53d723777c754412abf0e772b7cc284937c", -"algorithm": "sha512", -"filename": "gtk3.tar.xz", -"unpack": true -}, -{ "size": 167175, "digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831", "algorithm": "sha512", diff --git a/b2g/config/tooltool-manifests/linux64/releng.manifest b/b2g/config/tooltool-manifests/linux64/releng.manifest index d336d9b35e8..604e98b09cd 100644 --- a/b2g/config/tooltool-manifests/linux64/releng.manifest +++ b/b2g/config/tooltool-manifests/linux64/releng.manifest @@ -7,13 +7,6 @@ "unpack": true }, { -"size": 4431740, -"digest": "68fc56b0fb0cdba629b95683d6649ff76b00dccf97af90960c3d7716f6108b2162ffd5ffcd5c3a60a21b28674df688fe4dabc67345e2da35ec5abeae3d48c8e3", -"algorithm": "sha512", -"filename": "gtk3.tar.xz", -"unpack": true -}, -{ "size": 167175, "digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831", "algorithm": "sha512", diff --git a/browser/config/mozconfigs/linux64/hazards b/browser/config/mozconfigs/linux64/hazards index ebe46ccb82e..6c5e1937328 100644 --- a/browser/config/mozconfigs/linux64/hazards +++ b/browser/config/mozconfigs/linux64/hazards @@ -26,7 +26,6 @@ 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/asan.manifest b/browser/config/tooltool-manifests/linux64/asan.manifest index da4b77e8fbd..820177316a8 100644 --- a/browser/config/tooltool-manifests/linux64/asan.manifest +++ b/browser/config/tooltool-manifests/linux64/asan.manifest @@ -8,12 +8,5 @@ "algorithm": "sha512", "filename": "clang.tar.bz2", "unpack": true -}, -{ -"size": 4431740, -"digest": "68fc56b0fb0cdba629b95683d6649ff76b00dccf97af90960c3d7716f6108b2162ffd5ffcd5c3a60a21b28674df688fe4dabc67345e2da35ec5abeae3d48c8e3", -"algorithm": "sha512", -"filename": "gtk3.tar.xz", -"unpack": true } ] diff --git a/browser/config/tooltool-manifests/linux64/clang.manifest b/browser/config/tooltool-manifests/linux64/clang.manifest index ba2d63fe998..216b4eae703 100644 --- a/browser/config/tooltool-manifests/linux64/clang.manifest +++ b/browser/config/tooltool-manifests/linux64/clang.manifest @@ -8,12 +8,5 @@ "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 8050b05e1cb..6ad93dff486 100644 --- a/build/unix/mozconfig.gtk +++ b/build/unix/mozconfig.gtk @@ -1,38 +1,36 @@ -TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir} - -# $TOOLTOOL_DIR/gtk3 comes from tooltool, when the tooltool manifest contains it. -if [ -d "$TOOLTOOL_DIR/gtk3" ]; then +# $topsrcdir/gtk3 comes from tooltool, when the tooltool manifest contains it. +if [ -d "$topsrcdir/gtk3" ]; then if [ -z "$PKG_CONFIG_LIBDIR" ]; then echo PKG_CONFIG_LIBDIR must be set >&2 exit 1 fi - 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}" + 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$TOOLTOOL_DIR/gtk3/usr/local/lib ${LDFLAGS}" - mk_add_options "export LD_LIBRARY_PATH=$TOOLTOOL_DIR/gtk3/usr/local/lib" + LDFLAGS="-L$topsrcdir/gtk3/usr/local/lib ${LDFLAGS}" + mk_add_options "export LD_LIBRARY_PATH=$topsrcdir/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=$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" + 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" - # 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 + # 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 # same with gdb-pixbuf and 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 + 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 # The fontconfig version in the tooltool package has known uses of # uninitialized memory when creating its cache, and while most users @@ -45,7 +43,7 @@ if [ -d "$TOOLTOOL_DIR/gtk3" ]; then # 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 > $TOOLTOOL_DIR/gtk3/usr/local/etc/fonts/local.conf + cat << EOF > $topsrcdir/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 7dcd080f309..6686b39d0f0 100644 --- a/js/src/devtools/rootAnalysis/build/gcc.manifest +++ b/js/src/devtools/rootAnalysis/build/gcc.manifest @@ -8,12 +8,5 @@ "algorithm": "sha512", "filename": "gcc.tar.xz", "unpack": true -}, -{ -"size": 4431740, -"digest": "68fc56b0fb0cdba629b95683d6649ff76b00dccf97af90960c3d7716f6108b2162ffd5ffcd5c3a60a21b28674df688fe4dabc67345e2da35ec5abeae3d48c8e3", -"algorithm": "sha512", -"filename": "gtk3.tar.xz", -"unpack": true } ]