From 94eb0a16fd40bebc1c36af245850d988f39e8e4b Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Tue, 2 Jan 2024 13:21:29 +0100
Subject: [PATCH] CI rebuild and fixup of debug builds

Signed-off-by: falkTX <falktx@falktx.com>
---
 .github/workflows/bootstrap.yml |  2 +-
 bootstrap-plugins.sh            |  8 ++++++--
 setup/check_target.sh           |  3 ++-
 setup/functions.sh              | 14 +++++++-------
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
index b793504..85b5e01 100644
--- a/.github/workflows/bootstrap.yml
+++ b/.github/workflows/bootstrap.yml
@@ -4,7 +4,7 @@ on:
   push:
 
 env:
-  CACHE_VERSION: 8
+  CACHE_VERSION: 9
   DEBIAN_FRONTEND: noninteractive
   PAWPAW_SKIP_TESTS: 1
 
diff --git a/bootstrap-plugins.sh b/bootstrap-plugins.sh
index cffddd8..2d6d77c 100755
--- a/bootstrap-plugins.sh
+++ b/bootstrap-plugins.sh
@@ -533,7 +533,8 @@ fi # PAWPAW_SKIP_LV2
 
 if [ -z "${PAWPAW_SKIP_FLUIDSYNTH}" ] || [ "${PAWPAW_SKIP_FLUIDSYNTH}" -eq 0 ]; then
 
-FLUIDSYNTH_EXTRAFLAGS="-Denable-floats=ON"
+FLUIDSYNTH_EXTRAFLAGS=""
+FLUIDSYNTH_EXTRAFLAGS+=" -Denable-floats=ON"
 FLUIDSYNTH_EXTRAFLAGS+=" -Denable-alsa=OFF"
 FLUIDSYNTH_EXTRAFLAGS+=" -Denable-aufile=OFF"
 FLUIDSYNTH_EXTRAFLAGS+=" -Denable-coreaudio=OFF"
@@ -574,8 +575,11 @@ fi # PAWPAW_SKIP_FLUIDSYNTH
 # ---------------------------------------------------------------------------------------------------------------------
 # mxml
 
+MXML_EXTRAFLAGS=""
+MXML_EXTRAFLAGS+=" --with-archflags="
+
 download mxml "${MXML_VERSION}" "${MXML_URL}"
-build_autoconf mxml "${MXML_VERSION}"
+build_autoconf mxml "${MXML_VERSION}" "${MXML_EXTRAFLAGS}"
 
 # ---------------------------------------------------------------------------------------------------------------------
 # carla (backend only)
diff --git a/setup/check_target.sh b/setup/check_target.sh
index f2bd553..80f0cff 100644
--- a/setup/check_target.sh
+++ b/setup/check_target.sh
@@ -202,7 +202,8 @@ if [ "${CROSS_COMPILING}" -eq 1 ]; then
     PAWPAW_SKIP_TESTS=${PAWPAW_SKIP_TESTS:=1}
 fi
 
-# always skip stripping if building in debug mode
+# always skip lto and stripping if building in debug mode
 if [ -n "${PAWPAW_DEBUG}" ] && [ "${PAWPAW_DEBUG}" -eq 1 ]; then
+    PAWPAW_SKIP_LTO=1
     PAWPAW_SKIP_STRIPPING=1
 fi
diff --git a/setup/functions.sh b/setup/functions.sh
index d172bd6..e17895a 100644
--- a/setup/functions.sh
+++ b/setup/functions.sh
@@ -224,9 +224,9 @@ function build_autoconf() {
     fi
 
     if [ -n "${PAWPAW_DEBUG}" ] && [ "${PAWPAW_DEBUG}" -eq 1 ]; then
-        extraconfrules+=" --disable-debug"
-    else
         extraconfrules+=" --enable-debug"
+    else
+        extraconfrules+=" --disable-debug"
     fi
 
     _prebuild "${pkgname}" "${pkgdir}"
@@ -371,9 +371,9 @@ function build_cmake() {
     fi
 
     if [ -n "${PAWPAW_DEBUG}" ] && [ "${PAWPAW_DEBUG}" -eq 1 ]; then
-        extraconfrules+=" -DCMAKE_BUILD_TYPE=Release"
-    else
         extraconfrules+=" -DCMAKE_BUILD_TYPE=Debug"
+    else
+        extraconfrules+=" -DCMAKE_BUILD_TYPE=Release"
     fi
 
     if [ ! -f "${pkgdir}/.stamp_configured" ]; then
@@ -436,13 +436,13 @@ function build_meson() {
     local pkgdir="${PAWPAW_BUILDDIR}/${pkgname}-${version}"
 
     if [ "${CROSS_COMPILING}" -eq 1 ]; then
-        extraconfrules+=" --cross-file '${PAWPAW_ROOT}/setup/meson/${PAWPAW_TARGET}.ini'"
+        extraconfrules+=" --cross-file ${PAWPAW_ROOT}/setup/meson/${PAWPAW_TARGET}.ini"
     fi
 
     if [ -n "${PAWPAW_DEBUG}" ] && [ "${PAWPAW_DEBUG}" -eq 1 ]; then
-        extraconfrules+=" --buildtype release"
-    else
         extraconfrules+=" --buildtype debug"
+    else
+        extraconfrules+=" --buildtype release"
     fi
 
     _prebuild "${pkgname}" "${pkgdir}"