Skip to content
Browse files

builder: updates for mingw

Bump libgpg-error 1.27 -> 1.36 and add a patch to support gawk 5.0 from

Add meson to list of msys2 OS deps, this is not needed right now.

Remove glib `CreateFile` patch which has been removed from msys2
MINGW-packages master and add a couple of other patches.

Unfortunately using a newer glib release is not yet possible because of
weird linking errors with meson on mingw.

Add ninja to `host_dists` for ``, this is not needed currently.

Signed-off-by: Rafael Kitover <>
  • Loading branch information
rkitover committed Jul 17, 2019
1 parent fa45ccd commit ce11403b4ee4ed2d5c90152780cf9e381c8e1ec1
Showing with 9 additions and 5 deletions.
  1. +5 −2 tools/builder/
  2. +4 −3 tools/builder/
@@ -172,7 +172,7 @@ DISTS=$DISTS'
ninja bin/ninja
meson bin/meson
glib lib/libglib-2.0.a
libgpg-error lib/libgpg-error.a
libgpg-error lib/libgpg-error.a
libgcrypt lib/libgcrypt.a
libsecret lib/libsecret-1.a
sdl2 lib/libSDL2.a
@@ -241,6 +241,7 @@ DIST_PATCHES=$DIST_PATCHES'

graphviz autoreconf
docbook2x autoreconf
libvorbis autoreconf
libgpg-error autoreconf


glib -liconv
graphviz -lpcreposix
doxygen -lintl -liconv
ffmpeg -lm -llzma -lpthread
@@ -688,7 +691,7 @@ msys2_install_core_deps() {
pacman -Sy

set --
for p in binutils curl crt-git gcc gcc-libs headers-git tools-git windows-default-manifest libmangle-git; do
for p in binutils curl crt-git gcc gcc-libs headers-git tools-git windows-default-manifest libmangle-git meson; do
set -- "$@" "${target}-${p}"

@@ -60,7 +60,7 @@ perl_dists="$perl_dists XML-NamespaceSupport XML-SAX-Base XML-SAX"
perl_dists=$(list_remove_duplicates $perl_dists)

host_dists="$host_dists autoconf autoconf-archive automake m4 gsed bison \
flex-2.6.3 flex c2man docbook2x ccache"
flex-2.6.3 flex c2man docbook2x ccache ninja"
host_dists=$(list_remove_duplicates $host_dists)

both_dists="$both_dists openssl zlib bzip2 libiconv"
@@ -200,7 +200,7 @@ for dist in $both_dists; do
table_line_replace DIST_POST_BUILD $dist "eval \"\$(target_env)\"; $(table_line DIST_POST_BUILD $dist)"

remove_dists='graphviz python2 python3 swig libxml2-python doxygen bakefile setuptools pip meson XML-Parser intltool ninja libsecret shared-mime-info'
remove_dists='graphviz python2 python3 meson swig libxml2-python doxygen bakefile setuptools pip XML-Parser intltool libsecret shared-mime-info'

for dist in $remove_dists; do
if ! list_contains $dist $do_not_remove_dists; then
@@ -340,8 +340,9 @@ table_line_append DIST_ARGS gettext "--enable-threads=windows"
table_line_append DIST_ARGS glib "--with-threads=posix --disable-libelf"

table_line_append DIST_PATCHES glib "\ \ \ \ \ \

0 comments on commit ce11403

Please sign in to comment.
You can’t perform that action at this time.