From 8ee21cb6fe3a2aa76d2e474ad1efea93b88c0274 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 +-
 setup/functions.sh              | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 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/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}"