unos-repository

commit 4c01c41e7c6c16291eae1798c72a959a7210726d
parent d28492ea4c4b9ff2306f4388fa98eed65a420de9
Author: Robin Bron <robin.bron@yourhosting.nl>
Date:   Fri, 25 Sep 2026 18:02:53 +0200

Build apk-tools with target glibc

Diffstat:
M
.conductor.yml
 | 
29
+++++++++++++++--------------
M
packages/apk-tools/template
 | 
7
+++++--

2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/.conductor.yml b/.conductor.yml
@@ -45,6 +45,19 @@ tasks:
       - ./tests/run.sh --unit
       - ./mk/bootstrap-repo.sh
 
+  pkg-glibc:
+    needs:
+      - check
+    arch: [x86_64]
+    requires: [unos-sign-key]
+    script:
+      - ./mk/check-revision.sh glibc --pkgver 2.44-r6 --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || { rc=$?; [ "$rc" = 1 ] && exit 0; exit "$rc"; }
+      - ./mk/ci-setup.sh
+      - ./mk/bootstrap-host.sh
+      - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" glibc
+      - ./mk/build.sh glibc
+      - ./mk/publish.sh --arch "$ARCH" glibc
+
   pkg-zlib:
     needs:
       - check
@@ -74,6 +87,7 @@ tasks:
   pkg-apk-tools:
     needs:
       - check
+      - pkg-glibc
       - pkg-zlib
       - pkg-openssl
     arch: [x86_64]
@@ -194,19 +208,6 @@ tasks:
       - ./mk/build.sh efibootmgr
       - ./mk/publish.sh --arch "$ARCH" efibootmgr
 
-  pkg-glibc:
-    needs:
-      - check
-    arch: [x86_64]
-    requires: [unos-sign-key]
-    script:
-      - ./mk/check-revision.sh glibc --pkgver 2.44-r6 --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || { rc=$?; [ "$rc" = 1 ] && exit 0; exit "$rc"; }
-      - ./mk/ci-setup.sh
-      - ./mk/bootstrap-host.sh
-      - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" glibc
-      - ./mk/build.sh glibc
-      - ./mk/publish.sh --arch "$ARCH" glibc
-
   pkg-libstdcxx:
     needs:
       - check
@@ -411,6 +412,7 @@ tasks:
 
   index:
     after:
+      - pkg-glibc
       - pkg-zlib
       - pkg-openssl
       - pkg-apk-tools
@@ -422,7 +424,6 @@ tasks:
       - pkg-efivar
       - pkg-popt
       - pkg-efibootmgr
-      - pkg-glibc
       - pkg-libstdcxx
       - pkg-gptfdisk
       - pkg-xz
diff --git a/packages/apk-tools/template b/packages/apk-tools/template
@@ -8,8 +8,8 @@ license="GPL-2.0-only"
 homepage="https://gitlab.alpinelinux.org/alpine/apk-tools"
 distfiles="https://gitlab.alpinelinux.org/alpine/apk-tools/-/archive/v3.0.8/apk-tools-v3.0.8.tar.gz"
 checksum=e81c64a6e7c3806d45d4622c253e757aee970be84048554fa0eed79310e9453e
-depends="zlib openssl"
-makedepends="zlib openssl"
+depends="glibc zlib openssl"
+makedepends="glibc zlib openssl"
 hostmakedepends="muon"
 
 # Notes:
@@ -28,6 +28,9 @@ hostmakedepends="muon"
 do_configure() {
   mkdir -p "${WORK}/build"
   cd "${WRKSRC}"
+  # --sysroot: sysroot glibc headers redirect to __isoc23_*, absent in host libc.
+  export CFLAGS="${CFLAGS:-} --sysroot=${SYSROOT}"
+  export LDFLAGS="${LDFLAGS:-} --sysroot=${SYSROOT} -L${SYSROOT}/usr/lib -Wl,-rpath-link,${SYSROOT}/usr/lib"
   muon setup \
     -Dprefix=/usr \
     -Ddocs=disabled \