Skip to content

Commit

Permalink
CI rebuild and fixup of debug builds
Browse files Browse the repository at this point in the history
Signed-off-by: falkTX <[email protected]>
  • Loading branch information
falkTX committed Jan 2, 2024
1 parent 166de89 commit 8ee21cb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:

env:
CACHE_VERSION: 8
CACHE_VERSION: 9
DEBIAN_FRONTEND: noninteractive
PAWPAW_SKIP_TESTS: 1

Expand Down
14 changes: 7 additions & 7 deletions setup/functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}"
Expand Down

0 comments on commit 8ee21cb

Please sign in to comment.