From 1614e01c30ce54a6bfa3d0f028e99383668147c9 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Fri, 15 Dec 2023 17:05:44 -0500 Subject: [PATCH] fix(zlib) (#4452) * fix(zlib) boost complaining about -fPIC: https://github.com/pkgxdev/pantry/actions/runs/7226847979/job/19693299131 * don't include newlines --- .github/workflows/ci.yml | 4 ++-- projects/zlib.net/package.yml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a571a36f..676cc643 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: RESULT="$RESULT ${y//$'\n'/}" done if [ -n "$RESULT" ]; then - RESULT="$(echo $RESULT | jq -R -s -c 'split(" ")')" + RESULT="$(echo -n $RESULT | jq -R -s -c 'split(" ")')" else RESULT='["zlib.net"]' fi @@ -50,7 +50,7 @@ jobs: name: ² - os: ["self-hosted", "linux", "ARM64"] name: Lnx·ARM64 - - os: {group: "linux-x86-64"} + - os: { group: "linux-x86-64" } container: debian:buster-slim name: Lnx·x64 runs-on: ${{ matrix.platform.os }} diff --git a/projects/zlib.net/package.yml b/projects/zlib.net/package.yml index cc6fc38d..640ce0ef 100644 --- a/projects/zlib.net/package.yml +++ b/projects/zlib.net/package.yml @@ -9,6 +9,9 @@ build: script: | ./configure --prefix="{{prefix}}" make --jobs {{ hw.concurrency }} install + env: + linux/aarch64: + CFLAGS: '$CFLAGS -fPIC' test: script: |