From d2e0aa4e7348910dfba6fc201b86d1304c7b5136 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Tue, 30 Jan 2024 15:39:31 -0500 Subject: [PATCH] fix(mergefs) (#5055) * fix(mergefs) closes #5047 * wip --- projects/spawn.link/package.yml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/projects/spawn.link/package.yml b/projects/spawn.link/package.yml index c5be06d9..5eea0b41 100644 --- a/projects/spawn.link/package.yml +++ b/projects/spawn.link/package.yml @@ -11,19 +11,24 @@ build: dependencies: git-scm.org: '*' python.org: '>=3<3.12' - script: | + script: # Set the version - sed -i.bak -e 's/^VERSION=.*/VERSION={{ version }}/' tools/update-version - rm tools/update-version.bak + - run: sed -i -e 's/^VERSION=.*/VERSION={{ version }}/' update-version + if: <2.39 + working-directory: tools + - run: sed -i -e 's/^VERSION=.*/VERSION={{ version }}/' update-version + if: '>=2.39' + working-directory: buildtools # Don't try to chown/chmod on install - sed -i.bak -e '/\(chown\|chmod\)/d' libfuse/Makefile - rm libfuse/Makefile.bak + - sed -i -e '/\(chown\|chmod\)/d' libfuse/Makefile - make --jobs {{ hw.concurrency }} - make install DESTDIR="{{prefix}}" PREFIX="" + - make --jobs {{ hw.concurrency }} + - make install DESTDIR="{{prefix}}" PREFIX="" env: CFLAGS: -Wno-implicit-function-declaration + CC: clang + CXX: clang++ provides: - bin/mergerfs @@ -31,5 +36,4 @@ provides: - sbin/mount.mergerfs # FIXME: Maybe? Complicated to test something that mounts filesystems... -test: | - mergerfs --version | grep "{{ version }}" +test: mergerfs --version | grep "{{ version }}"