From d08dd6cd188e6acf69c367b6cbd8fbab65e86a7e Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Tue, 16 Apr 2019 00:08:45 +0000 Subject: [PATCH] builder: opensuse update 2 Install python3 in cross deps and call glib configure with the path to it. Signed-off-by: Rafael Kitover --- tools/builder/mingw-cross.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/builder/mingw-cross.sh b/tools/builder/mingw-cross.sh index 6ee23bad..945d7874 100644 --- a/tools/builder/mingw-cross.sh +++ b/tools/builder/mingw-cross.sh @@ -93,7 +93,7 @@ suse_install_cross_deps() { set -- "$@" "${pkg_prefix}-${p}" done - sudo zypper in -y "$@" gettext-tools wxGTK3-3_2-devel python + sudo zypper in -y "$@" gettext-tools wxGTK3-3_2-devel python3-pip } case "$linux_distribution" in @@ -123,6 +123,8 @@ table_line_append DIST_PATCHES openal '-p0 https://gist.githubusercontent.com/rk table_line_replace DIST_POST_BUILD harfbuzz "$(table_line DIST_POST_BUILD harfbuzz | sed 's/rebuild_dist freetype /rebuild_dist freetype-target /')" +table_line_append DIST_ARGS glib --with-python=/usr/bin/python3 + table_line_replace DIST_POST_BUILD glib "$(table_line DIST_POST_BUILD glib | sed 's/rebuild_dist gettext /rebuild_dist gettext-target /')" table_line_append DIST_ARGS libsoxr '-DHAVE_WORDS_BIGENDIAN_EXITCODE=0'