From 8f8fb05a3f87ac274e4ada4bd7eb1c5f38ebf98e Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sat, 23 Dec 2023 14:32:26 +0100
Subject: [PATCH] Fix liblo tests

Signed-off-by: falkTX <falktx@falktx.com>
---
 bootstrap-plugins.sh | 7 +++++--
 setup/env.sh         | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bootstrap-plugins.sh b/bootstrap-plugins.sh
index 2b89e4b..d70ebed 100755
--- a/bootstrap-plugins.sh
+++ b/bootstrap-plugins.sh
@@ -408,7 +408,7 @@ fi # PAWPAW_SKIP_GLIB
 
 LIBLO_EXTRAFLAGS="--enable-threads --disable-examples --disable-tools"
 
-if [ -z "${PAWPAW_SKIP_TESTS}" ] || [ "${PAWPAW_SKIP_TESTS}" -eq 0 ]; then
+if [ -n "${PAWPAW_SKIP_TESTS}" ] && [ "${PAWPAW_SKIP_TESTS}" -eq 1 ]; then
     LIBLO_EXTRAFLAGS+=" --disable-tests"
 fi
 
@@ -418,13 +418,16 @@ if [ "${MACOS}" -eq 1 ]; then
     if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
         LIBLO_EXTRAFLAGS+=" ac_cv_c_bigendian=universal"
     fi
+# use of wrong macro, should be _WIN32
+elif [ "${MACOS}" -eq 1 ]; then
+    export EXTRA_CFLAGS="-DWIN32"
 fi
 
 download liblo "${LIBLO_VERSION}" "${LIBLO_URL}"
 build_autoconf liblo "${LIBLO_VERSION}" "${LIBLO_EXTRAFLAGS}"
 
 # FIXME tests fail on macOS
-if [ -z "${PAWPAW_SKIP_TESTS}" ] || [ "${PAWPAW_SKIP_TESTS}" -eq 0 ] && [ "${MACOS}" -eq 0 ]; then
+if ([ -z "${PAWPAW_SKIP_TESTS}" ] || [ "${PAWPAW_SKIP_TESTS}" -eq 0 ]) && [ "${MACOS}" -eq 0 ]; then
     run_make liblo "${LIBLO_VERSION}" check
 fi
 
diff --git a/setup/env.sh b/setup/env.sh
index 755d874..b1a88c5 100644
--- a/setup/env.sh
+++ b/setup/env.sh
@@ -65,7 +65,7 @@ if [ -z "${PAWPAW_SKIP_LTO}" ] || [ "${PAWPAW_SKIP_LTO}" -eq 0 ]; then
     PAWPAW_PREFIX+="-lto"
 fi
 
-if [ -n "${PAWPAW_NOSIMD}" ] && [ "${PAWPAW_NOSIMD}" -ne 0 ]; then
+if [ -n "${PAWPAW_NOSIMD}" ] && [ "${PAWPAW_NOSIMD}" -eq 1 ]; then
     PAWPAW_BUILDDIR+="-nosimd"
     PAWPAW_PREFIX+="-nosimd"
 fi