Merge branch 'tachyon_rpath' into HEAD

mkoeppe · Aug 20, 2024 · cb7c499 · cb7c499
2 parents f4624b4 + 069f036
commit cb7c499
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 58 deletions.
diff --git a/build/pkgs/tachyon/package-version.txt b/build/pkgs/tachyon/package-version.txt
@@ -1 +1 @@
-0.99.5
+0.99.5.p0
diff --git a/build/pkgs/tachyon/patches/Make-config.patch b/build/pkgs/tachyon/patches/Make-config.patch
diff --git a/build/pkgs/tachyon/spkg-install.in b/build/pkgs/tachyon/spkg-install.in
@@ -52,7 +52,8 @@ if [ -z "$TARGET" ]; then
     sdh_die "Error: Sorry, your platform isn't supported by Tachyon and/or Sage. Exiting..."
 fi
 
-sdh_make "$TARGET"
+# The Makefile ignores LDFLAGS; we include it here so that rpath is set on Linux
+sdh_make "$TARGET" USEPNG=-DUSEPNG PNGLIB="$LDFLAGS -lpng -lz"
 
 echo "Installing the Tachyon binary..."
 cd "$CUR"