ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

builder: fix libuuid_mingw for mingw cross 

Unset UUID_LIBS when building host fontconfig, which contains
-luuid_mingw for the cross fontconfig.

Add trailing semicolons on core POST_BUILD actions.
This commit is contained in:
Rafael Kitover 2018-09-08 19:59:07 +00:00
parent 5b5e319378
commit 3aa00bfbbf
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/builder/core.sh
View File

@ -305,16 +305,16 @@ DIST_PRE_BUILD="$DIST_PRE_BUILD
DIST_POST_BUILD="$DIST_POST_BUILD DIST_POST_BUILD="$DIST_POST_BUILD
harfbuzz rebuild_dist freetype --with-harfbuzz=yes; harfbuzz rebuild_dist freetype --with-harfbuzz=yes;
flex-2.6.3 build_dist flex || :; flex-2.6.3 build_dist flex || :;
libtool ln -sf '$BUILD_ROOT/root/bin/libtoolize' '$BUILD_ROOT/root/bin/glibtoolize' libtool ln -sf '$BUILD_ROOT/root/bin/libtoolize' '$BUILD_ROOT/root/bin/glibtoolize';
glib rebuild_dist gettext --without-included-glib --without-included-libxml; glib rebuild_dist gettext --without-included-glib --without-included-libxml;
graphviz (cd '$BUILD_ROOT/root/bin'; path_exists dot_static && ! path_exists dot && ln -sf '$BUILD_ROOT/root/bin/dot_static' ./dot || :) graphviz (cd '$BUILD_ROOT/root/bin'; path_exists dot_static && ! path_exists dot && ln -sf '$BUILD_ROOT/root/bin/dot_static' ./dot || :);
libxml2 mkdir -p '$BUILD_ROOT/root/etc/xml'; \ libxml2 mkdir -p '$BUILD_ROOT/root/etc/xml'; \
xmlcatalog --noout --create \"\$(cygpath -m \"$BUILD_ROOT/root/etc/xml/catalog.xml\")\" || :; xmlcatalog --noout --create \"\$(cygpath -m \"$BUILD_ROOT/root/etc/xml/catalog.xml\")\" || :;
python2 pip2 install six; python2 pip2 install six;
python3 pip3 install six; python3 pip3 install six;
fontconfig mkdir -p '$BUILD_ROOT/root/etc/fonts'; \ fontconfig mkdir -p '$BUILD_ROOT/root/etc/fonts'; \
touch '$BUILD_ROOT/root/etc/fonts/fonts.conf'; \ touch '$BUILD_ROOT/root/etc/fonts/fonts.conf'; \
sed -i.bak 's|/usr/share/fonts|$BUILD_ROOT/root/share/fonts|g' '$BUILD_ROOT/root/etc/fonts/fonts.conf' sed -i.bak 's|/usr/share/fonts|$BUILD_ROOT/root/share/fonts|g' '$BUILD_ROOT/root/etc/fonts/fonts.conf';
" "
DIST_POST_CONFIGURE="$DIST_POST_CONFIGURE DIST_POST_CONFIGURE="$DIST_POST_CONFIGURE

4
tools/builder/mingw-cross.sh
View File

@ -66,6 +66,10 @@ table_line_replace DIST_POST_BUILD glib "$(table_line DIST_POST_BUILD glib
table_line_append DIST_ARGS libsoxr '-DHAVE_WORDS_BIGENDIAN_EXITCODE=0' table_line_append DIST_ARGS libsoxr '-DHAVE_WORDS_BIGENDIAN_EXITCODE=0'
# don't want mingw libuuid for host fontconfig
table_line_append DIST_PRE_BUILD fontconfig ':; unset UUID_LIBS;'
table_line_append DIST_POST_BUILD fontconfig ':; eval "$BUILD_ENV";'
vpx_target=x86-win32-gcc vpx_target=x86-win32-gcc
[ "$target_bits" -eq 64 ] && vpx_target=x86_64-win64-gcc [ "$target_bits" -eq 64 ] && vpx_target=x86_64-win64-gcc