From dc9b6a3c5c325961f5e3fb453160bc98a0df0513 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
Date: Sat, 16 Sep 2023 12:03:06 +0200
Subject: [PATCH] ci: run full testsuite under musl libc
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
---
 .github/workflows/cibuild.sh         |  4 ++++
 .github/workflows/cibuild.yml        | 10 ++++++++++
 .github/workflows/openwrt-sdk-env.sh |  4 +++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cibuild.sh b/.github/workflows/cibuild.sh
index dfcf91c757..0bd8d40df6 100755
--- a/.github/workflows/cibuild.sh
+++ b/.github/workflows/cibuild.sh
@@ -107,6 +107,10 @@ for phase in "${PHASES[@]}"; do
             opts+=(--host "$HOST_TRIPLET")
         fi
 
+        if [[ "$DYNAMIC_LINKER" != "" ]]; then
+            LDFLAGS+=("-Wl,--dynamic-linker=$DYNAMIC_LINKER")
+        fi
+
         git config --global --add safe.directory "$PWD"
         git clean -xdf
 
diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml
index 8a48287b91..3e5ea0aad9 100644
--- a/.github/workflows/cibuild.yml
+++ b/.github/workflows/cibuild.yml
@@ -204,6 +204,9 @@ jobs:
           - target: mpc85xx
             subtarget: p2020
             abi: musl
+          - target: x86
+            subtarget: generic
+            abi: musl
           - target: archs38
             subtarget: generic
             abi: glibc
@@ -221,6 +224,7 @@ jobs:
           echo "COMPILER=$COMPILER" >> $GITHUB_ENV
           echo "OPENWRT_RELEASE=$OPENWRT_RELEASE" >> $GITHUB_ENV
           echo "OPENWRT_SDK=$OPENWRT_SDK" >> $GITHUB_ENV
+          echo "OPENWRT_TARGET=${{ matrix.target }}" >> $GITHUB_ENV
       - name: Cache OpenWRT SDK
         id: cache-openwrt-sdk
         uses: actions/cache@v3
@@ -240,3 +244,9 @@ jobs:
         run: |
           source .github/workflows/openwrt-sdk-env.sh  ~/${{ env.OPENWRT_SDK }}
           .github/workflows/cibuild.sh MAKE
+      - name: Check
+        run: |
+          source .github/workflows/openwrt-sdk-env.sh  ~/${{ env.OPENWRT_SDK }}
+          if [[ "$OPENWRT_TARGET" = "x86" ]]; then
+              .github/workflows/cibuild.sh CHECK
+          fi
diff --git a/.github/workflows/openwrt-sdk-env.sh b/.github/workflows/openwrt-sdk-env.sh
index c3d618decf..91a198d2f8 100755
--- a/.github/workflows/openwrt-sdk-env.sh
+++ b/.github/workflows/openwrt-sdk-env.sh
@@ -7,11 +7,13 @@ STAGING_DIR="$(echo "$sdk"/staging_dir/toolchain-*)"
 . "$STAGING_DIR/info.mk"
 
 PATH="$sdk/staging_dir/host/bin:$PATH"
+LD_LIBRARY_PATH="$STAGING_DIR/lib"
 CC="$STAGING_DIR/bin/${TARGET_CROSS}gcc"
+DYNAMIC_LINKER="$(echo "$STAGING_DIR"/lib/ld-musl-*)"
 BISON_PKGDATADIR="$sdk/staging_dir/host/share/bison"
 M4="$sdk/staging_dir/host/bin/m4"
 HOST_TRIPLET="$("$CC" -dumpmachine)"
 
 echo "Building for $HOST_TRIPLET from $sdk"
 
-export STAGING_DIR PATH CC BISON_PKGDATADIR M4 HOST_TRIPLET
+export STAGING_DIR PATH LD_LIBRARY_PATH CC DYNAMIC_LINKER BISON_PKGDATADIR M4 HOST_TRIPLET
-- 
2.47.3