Fix out-of-tree build
Adapt to new-old location of sysroot and
deal with some build issues caused by
the new toolchain.
Change-Id: I8f708e03ac8e8ee3e1a6e40a7eed7d0b26929bc3
diff --git a/Tools/fuchsia/build_libpng.sh b/Tools/fuchsia/build_libpng.sh
index 7099834..1ae3888 100755
--- a/Tools/fuchsia/build_libpng.sh
+++ b/Tools/fuchsia/build_libpng.sh
@@ -44,16 +44,16 @@
esac
done
-PNG_NAME_VERSION=libpng-1.6.28
+PNG_NAME_VERSION=libpng-1.6.31
PNG_ARCHIVE=$PNG_NAME_VERSION.tar.xz
PNG_ROOT=$WM_DEPS_SOURCE_DIR/$PNG_NAME_VERSION
if [ ! -d "$PNG_ROOT" ]; then
cd $WM_DEPS_SOURCE_DIR
if [ ! -f $PNG_ARCHIVE ]; then
- wget https://sourceforge.net/projects/libpng/files/libpng16/1.6.28/$PNG_NAME_VERSION.tar.xz
+ wget https://sourceforge.net/projects/libpng/files/libpng16/1.6.31/$PNG_NAME_VERSION.tar.xz
fi
-
+
tar xf $PNG_ARCHIVE
fi
diff --git a/Tools/fuchsia/build_pixman.sh b/Tools/fuchsia/build_pixman.sh
index 04f3532..30debc1 100755
--- a/Tools/fuchsia/build_pixman.sh
+++ b/Tools/fuchsia/build_pixman.sh
@@ -53,7 +53,7 @@
if [ ! -f $PIXMAN_ARCHIVE ]; then
wget https://cairographics.org/releases/$PIXMAN_ARCHIVE
fi
-
+
tar xf $PIXMAN_ARCHIVE
fi
@@ -62,7 +62,19 @@
declare -x CFLAGS="$CFLAGS -DPIXMAN_NO_TLS"
$PIXMAN_ROOT/configure --prefix=$FUCHSIA_CROSS_ROOT --host=x86_64-fuchsia-elf --disable-gtk
+
+os_name=`uname`
+case $os_name in
+Linux)
+ sed -i '/#define HAVE_GCC_VECTOR_EXTENSIONS.*/d' config.h
+ ;;
+Darwin)
+ sed -i '' '/#define HAVE_GCC_VECTOR_EXTENSIONS.*/d' config.h
+ ;;
+esac
+
make $PARALLEL
+
make install
make_stamp pixman
diff --git a/Tools/fuchsia/common.sh b/Tools/fuchsia/common.sh
index 0cbe775..ee775a6 100644
--- a/Tools/fuchsia/common.sh
+++ b/Tools/fuchsia/common.sh
@@ -55,7 +55,7 @@
: ${FUCHSIA_ROOT=$default_fuchsia_root} && export FUCHSIA_ROOT
: ${FUCHSIA_BUILDTOOLS=$FUCHSIA_ROOT/buildtools$buildtools_prefix} && export FUCHSIA_BUILDTOOLS
: ${FUCHSIA_TOOLCHAIN=$FUCHSIA_ROOT/buildtools/toolchain/clang+llvm-x86_64-$toolchain_suffix} && export FUCHSIA_TOOLCHAIN
-: ${FUCHSIA_SYSROOT=$FUCHSIA_ROOT/out/$build_tag-x86-64/sysroot} && export FUCHSIA_SYSROOT
+: ${FUCHSIA_SYSROOT=$FUCHSIA_ROOT/out/build-magenta/build-magenta-pc-x86-64/sysroot} && export FUCHSIA_SYSROOT
: ${MAGENTA_ROOT=$FUCHSIA_ROOT/magenta} && export MAGENTA_ROOT
: ${MAGENTA_TOOLCHAINS=$HOME/projects/magenta_toolchains} && export MAGENTA_TOOLCHAINS
: ${WEBKIT_ROOT=$FUCHSIA_ROOT/third_party/webkit} && export WEBKIT_ROOT
