зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1186748 - Switch hazard and root analysis builds to Gtk+3. r=mshal
This commit is contained in:
Родитель
71c3de0d20
Коммит
c2ba6b7aa9
|
@ -26,6 +26,7 @@ CFLAGS="$CFLAGS -Wno-attributes"
|
||||||
CPPFLAGS="$CPPFLAGS -Wno-attributes"
|
CPPFLAGS="$CPPFLAGS -Wno-attributes"
|
||||||
CXXFLAGS="$CXXFLAGS -Wno-attributes"
|
CXXFLAGS="$CXXFLAGS -Wno-attributes"
|
||||||
|
|
||||||
|
TOOLTOOL_DIR="$(dirname $topsrcdir)"
|
||||||
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
|
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
|
||||||
. $topsrcdir/build/unix/mozconfig.gtk
|
. $topsrcdir/build/unix/mozconfig.gtk
|
||||||
|
|
||||||
|
|
|
@ -8,5 +8,12 @@
|
||||||
"algorithm": "sha512",
|
"algorithm": "sha512",
|
||||||
"filename": "clang.tar.bz2",
|
"filename": "clang.tar.bz2",
|
||||||
"unpack": true
|
"unpack": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"size": 4431740,
|
||||||
|
"digest": "68fc56b0fb0cdba629b95683d6649ff76b00dccf97af90960c3d7716f6108b2162ffd5ffcd5c3a60a21b28674df688fe4dabc67345e2da35ec5abeae3d48c8e3",
|
||||||
|
"algorithm": "sha512",
|
||||||
|
"filename": "gtk3.tar.xz",
|
||||||
|
"unpack": true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,41 +1,43 @@
|
||||||
# $topsrcdir/gtk3 comes from tooltool, when the tooltool manifest contains it.
|
TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
|
||||||
if [ -d "$topsrcdir/gtk3" ]; then
|
|
||||||
|
# $TOOLTOOL_DIR/gtk3 comes from tooltool, when the tooltool manifest contains it.
|
||||||
|
if [ -d "$TOOLTOOL_DIR/gtk3" ]; then
|
||||||
if [ -z "$PKG_CONFIG_LIBDIR" ]; then
|
if [ -z "$PKG_CONFIG_LIBDIR" ]; then
|
||||||
echo PKG_CONFIG_LIBDIR must be set >&2
|
echo PKG_CONFIG_LIBDIR must be set >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
export PKG_CONFIG_SYSROOT_DIR="$topsrcdir/gtk3"
|
export PKG_CONFIG_SYSROOT_DIR="$TOOLTOOL_DIR/gtk3"
|
||||||
export PKG_CONFIG_PATH="$topsrcdir/gtk3/usr/local/lib/pkgconfig"
|
export PKG_CONFIG_PATH="$TOOLTOOL_DIR/gtk3/usr/local/lib/pkgconfig"
|
||||||
export PATH="$topsrcdir/gtk3/usr/local/bin:${PATH}"
|
export PATH="$TOOLTOOL_DIR/gtk3/usr/local/bin:${PATH}"
|
||||||
# Ensure cairo, gdk-pixbuf, etc. are not taken from the system installed packages.
|
# Ensure cairo, gdk-pixbuf, etc. are not taken from the system installed packages.
|
||||||
LDFLAGS="-L$topsrcdir/gtk3/usr/local/lib ${LDFLAGS}"
|
LDFLAGS="-L$TOOLTOOL_DIR/gtk3/usr/local/lib ${LDFLAGS}"
|
||||||
mk_add_options "export LD_LIBRARY_PATH=$topsrcdir/gtk3/usr/local/lib"
|
mk_add_options "export LD_LIBRARY_PATH=$TOOLTOOL_DIR/gtk3/usr/local/lib"
|
||||||
ac_add_options --enable-default-toolkit=cairo-gtk3
|
ac_add_options --enable-default-toolkit=cairo-gtk3
|
||||||
|
|
||||||
# Set things up to use Gtk+3 from the tooltool package
|
# 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 FONTCONFIG_PATH=$TOOLTOOL_DIR/gtk3/usr/local/etc/fonts"
|
||||||
mk_add_options "export PANGO_SYSCONFDIR=$topsrcdir/gtk3/usr/local/etc"
|
mk_add_options "export PANGO_SYSCONFDIR=$TOOLTOOL_DIR/gtk3/usr/local/etc"
|
||||||
mk_add_options "export PANGO_LIBDIR=$topsrcdir/gtk3/usr/local/lib"
|
mk_add_options "export PANGO_LIBDIR=$TOOLTOOL_DIR/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_MODULE_FILE=$TOOLTOOL_DIR/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 GDK_PIXBUF_MODULEDIR=$TOOLTOOL_DIR/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 LD_LIBRARY_PATH=$TOOLTOOL_DIR/gtk3/usr/local/lib"
|
||||||
|
|
||||||
# pango expects absolute paths in pango.modules, and topsrcdir may vary...
|
# pango expects absolute paths in pango.modules, and TOOLTOOL_DIR may vary...
|
||||||
LD_LIBRARY_PATH=$topsrcdir/gtk3/usr/local/lib \
|
LD_LIBRARY_PATH=$TOOLTOOL_DIR/gtk3/usr/local/lib \
|
||||||
PANGO_SYSCONFDIR=$topsrcdir/gtk3/usr/local/etc \
|
PANGO_SYSCONFDIR=$TOOLTOOL_DIR/gtk3/usr/local/etc \
|
||||||
PANGO_LIBDIR=$topsrcdir/gtk3/usr/local/lib \
|
PANGO_LIBDIR=$TOOLTOOL_DIR/gtk3/usr/local/lib \
|
||||||
$topsrcdir/gtk3/usr/local/bin/pango-querymodules > $topsrcdir/gtk3/usr/local/etc/pango/pango.modules
|
$TOOLTOOL_DIR/gtk3/usr/local/bin/pango-querymodules > $TOOLTOOL_DIR/gtk3/usr/local/etc/pango/pango.modules
|
||||||
|
|
||||||
# same with gdb-pixbuf and loaders.cache
|
# same with gdb-pixbuf and loaders.cache
|
||||||
LD_LIBRARY_PATH=$topsrcdir/gtk3/usr/local/lib \
|
LD_LIBRARY_PATH=$TOOLTOOL_DIR/gtk3/usr/local/lib \
|
||||||
GDK_PIXBUF_MODULE_FILE=$topsrcdir/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
|
GDK_PIXBUF_MODULE_FILE=$TOOLTOOL_DIR/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 \
|
GDK_PIXBUF_MODULEDIR=$TOOLTOOL_DIR/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
|
$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
|
# mock build environment doesn't have fonts in /usr/share/fonts, but
|
||||||
# has some in /usr/share/X11/fonts. Add this directory to the
|
# has some in /usr/share/X11/fonts. Add this directory to the
|
||||||
# fontconfig configuration without changing the gtk3 tooltool package.
|
# 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
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
|
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
|
||||||
<fontconfig>
|
<fontconfig>
|
||||||
|
|
|
@ -8,5 +8,12 @@
|
||||||
"algorithm": "sha512",
|
"algorithm": "sha512",
|
||||||
"filename": "gcc.tar.xz",
|
"filename": "gcc.tar.xz",
|
||||||
"unpack": true
|
"unpack": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"size": 4431740,
|
||||||
|
"digest": "68fc56b0fb0cdba629b95683d6649ff76b00dccf97af90960c3d7716f6108b2162ffd5ffcd5c3a60a21b28674df688fe4dabc67345e2da35ec5abeae3d48c8e3",
|
||||||
|
"algorithm": "sha512",
|
||||||
|
"filename": "gtk3.tar.xz",
|
||||||
|
"unpack": true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
Загрузка…
Ссылка в новой задаче