diff --git a/data/macos/build-deps.sh b/data/macos/build-deps.sh index bc4f33d09..c1ff9b026 100755 --- a/data/macos/build-deps.sh +++ b/data/macos/build-deps.sh @@ -304,8 +304,6 @@ if [ ! -f gettext-${GETTEXT_VERSION}/build-done ]; then cd .. fi -return - # ------------------------------------------------------------------------------------ # glib @@ -318,10 +316,13 @@ fi if [ ! -f glib-${GLIB_VERSION}/build-done ]; then cd glib-${GLIB_VERSION} chmod +x configure install-sh - env PATH=/opt/local/bin:$PATH ./configure --enable-static --disable-shared --prefix=${PREFIX} + env PATH=/opt/local/bin:$PATH LDFLAGS="-L${PREFIX}/lib -m${ARCH}" \ + ./configure --enable-static --disable-shared --prefix=${PREFIX} + env PATH=/opt/local/bin:$PATH make ${MAKE_ARGS} || true + touch gio/gio-querymodules gio/glib-compile-resources gio/gsettings gio/gdbus gio/gresource gio/gapplication env PATH=/opt/local/bin:$PATH make ${MAKE_ARGS} touch $PREFIX/bin/gtester-report - make install + env PATH=/opt/local/bin:$PATH make install touch build-done cd .. fi @@ -330,7 +331,7 @@ fi # fluidsynth if [ ! -d fluidsynth-${FLUIDSYNTH_VERSION} ]; then - curl -O https://download.sourceforge.net/fluidsynth/fluidsynth-${FLUIDSYNTH_VERSION}.tar.gz + curl -L https://download.sourceforge.net/fluidsynth/fluidsynth-${FLUIDSYNTH_VERSION}.tar.gz -o fluidsynth-${FLUIDSYNTH_VERSION}.tar.gz tar -xf fluidsynth-${FLUIDSYNTH_VERSION}.tar.gz fi diff --git a/data/macos/common.env b/data/macos/common.env index 89a79ebd2..21f8abe9c 100644 --- a/data/macos/common.env +++ b/data/macos/common.env @@ -12,8 +12,8 @@ LIBGIG_VERSION=4.0.0 LINUXSAMPLER_VERSION=2.0.0 LIBFFI_VERSION=3.2.1 GETTEXT_VERSION=0.18.3.2 -GLIB_VERSION=2.42.2 -GLIB_MVERSION=2.42 +GLIB_VERSION=2.44.1 +GLIB_MVERSION=2.44 FLUIDSYNTH_VERSION=1.1.6 QT5_VERSION=5.5.1 QT5_MVERSION=5.5