From 78166adf2bb7929ddb1e051eac0068d29fe19cb2 Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Wed, 6 Oct 2021 22:37:10 +1100
Subject: [PATCH 1/2] wayland: does not build with NDEBUG

---
 packages/wayland/wayland/package.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/wayland/wayland/package.mk b/packages/wayland/wayland/package.mk
index fbc6ac6da8..40f472dbcd 100644
--- a/packages/wayland/wayland/package.mk
+++ b/packages/wayland/wayland/package.mk
@@ -26,6 +26,11 @@ PKG_CONFIGURE_OPTS_TARGET="--with-sysroot=${SYSROOT_PREFIX} \
                            --disable-documentation \
                            --with-gnu-ld"
 
+pre_configure_target() {
+  # wayland does not build with NDEBUG (requires assert for tests)
+  export CFLAGS=$(echo ${CFLAGS} | sed -e "s|-DNDEBUG||g")
+}
+
 post_makeinstall_target() {
   rm -rf ${INSTALL}/usr/bin
   rm -rf ${INSTALL}/usr/share

From d57ad467e7fdfda5726f15d4c4cf04ec8b8e4e27 Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Wed, 6 Oct 2021 23:57:15 +1100
Subject: [PATCH 2/2] xorg-intel-gpu-tools: does not build with NDEBUG

---
 packages/debug/xorg-intel-gpu-tools/package.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/debug/xorg-intel-gpu-tools/package.mk b/packages/debug/xorg-intel-gpu-tools/package.mk
index d27151ea93..c25eb6ed9b 100644
--- a/packages/debug/xorg-intel-gpu-tools/package.mk
+++ b/packages/debug/xorg-intel-gpu-tools/package.mk
@@ -21,3 +21,8 @@ PKG_MESON_OPTS_TARGET="-Dbuild_overlay=false \
                        -Dwith_libdrm=auto \
                        -Dwith_libunwind=false \
                        -Dbuild_runner=false"
+
+pre_configure_target() {
+  # xorg-intel-gpu-tools does not build with NDEBUG (requires assert for tests)
+  export TARGET_CFLAGS=$(echo ${TARGET_CFLAGS} | sed -e "s|-DNDEBUG||g")
+}