Merge pull request #167 from bgilbert/linux

Small Linux build improvements
openslide · Oct 29, 2023 · f2a3b47 · f2a3b47
2 parents 47c411f + b5dd912
commit f2a3b47
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.github/workflows/direct.yml b/.github/workflows/direct.yml
@@ -41,6 +41,8 @@ jobs:
               mv ${f}.new $f
           done
           patchelf --set-rpath '$ORIGIN' slidetool
+      - name: Smoke test
+        run: OPENSLIDE_DEBUG=synthetic meson/output/slidetool prop list ''
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:

diff --git a/build.sh b/build.sh
@@ -257,7 +257,7 @@ sdist() {
     cp builder/linux/Dockerfile "${zipdir}/builder/linux/"
     cp builder/windows/{Dockerfile,package.accept_keywords,package.use,repos.conf} \
             "${zipdir}/builder/windows/"
-    cp meson/cross-win32.ini meson/cross-win64.ini \
+    cp meson/{cross-win{32,64},native-linux-x86_64}.ini \
             meson/meson.build meson/meson_options.txt "${zipdir}/meson/"
     cp meson/include/setjmp.h "${zipdir}/meson/include/"
     rm -f "${zipdir}.zip"