unos-repository

commit 992c3a37c16da7d40902da11ca8d802d50828093
parent b8c0ff88643d2c3cde6a37d42f168b57a980fa09
Author: Robin Bron <robin.bron@yourhosting.nl>
Date:   Fri, 25 Sep 2026 18:42:09 +0200

More compile fixes

Diffstat:
M
mk/ci-setup.sh
 | 
1
+
M
packages/apk-tools/template
 | 
4
+++-

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/mk/ci-setup.sh b/mk/ci-setup.sh
@@ -60,6 +60,7 @@ if [ "${CHECK_ONLY}" = "0" ]; then
     libssl-dev \
     zlib1g-dev \
     libzstd-dev \
+    libelf-dev \
     >/dev/null
   rm -rf /var/lib/apt/lists/*
 
diff --git a/packages/apk-tools/template b/packages/apk-tools/template
@@ -29,7 +29,9 @@ do_configure() {
   mkdir -p "${WORK}/build"
   cd "${WRKSRC}"
   # --sysroot: sysroot glibc headers redirect to __isoc23_*, absent in host libc.
-  export CFLAGS="${CFLAGS:-} --sysroot=${SYSROOT}"
+  # -isystem: kernel UAPI headers (linux/*, asm/*) live on the host only, and
+  # rank below the sysroot -I so glibc still resolves from the sysroot.
+  export CFLAGS="${CFLAGS:-} --sysroot=${SYSROOT} -isystem /usr/include"
   export LDFLAGS="${LDFLAGS:-} --sysroot=${SYSROOT} -L${SYSROOT}/usr/lib -Wl,-rpath-link,${SYSROOT}/usr/lib"
   muon setup \
     -Dprefix=/usr \