From 096c2b78e4b0e5a85398d13f664dd184fe2828fc Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 30 Jul 2022 10:15:41 +0300 Subject: [PATCH 52/52] meson-winbuild.sh: Explicitly disable readline See osdn #45137 Signed-off-by: Marko Lindqvist --- windows/installer_cross/meson-winbuild.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/windows/installer_cross/meson-winbuild.sh b/windows/installer_cross/meson-winbuild.sh index 372930a50a..04668114f7 100755 --- a/windows/installer_cross/meson-winbuild.sh +++ b/windows/installer_cross/meson-winbuild.sh @@ -124,9 +124,18 @@ export PKG_CONFIG_PATH=${DLLSPATH}/lib/pkgconfig export PATH="$DLLSPATH/linux/libexec:$PATH" -if ! meson --cross-file=cross.txt -Dprefix=$MESON_INSTALL_DIR -Dclients=$CLIENT -Dfcmp=$FCMP \ - ${NLS} -Dsyslua=false -Dmwand=false -Druledit=$RULEDIT $QTPARAMS \ - ../../.. $EXTRA_CONFIG ; then +if ! meson \ + --cross-file=cross.txt \ + -Dprefix="$MESON_INSTALL_DIR" \ + -Dclients="$CLIENT" -Dfcmp="$FCMP" \ + ${NLS} \ + -Dsyslua=false \ + -Dmwand=false \ + -Dreadline=false \ + -Druledit="$RULEDIT" \ + $QTPARAMS \ + $EXTRA_CONFIG \ + ../../.. ; then echo "Meson run failed!" >&2 exit 1 fi -- 2.35.1