aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <urchlay@slackware.uk>2024-11-07 04:44:19 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2024-11-16 16:41:15 +0700
commite866bd34267e85452f6eeb03a1903c496db7a1d3 (patch)
tree358b30301a26ac84a5e4df039da75fc73d1c867b
parentd7f3b75091ecbd75f6b470ddf70550c3315e86bf (diff)
games/noteye: Fix for new luajit.
Signed-off-by: B. Watson <urchlay@slackware.uk> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--games/noteye/noteye.SlackBuild8
1 files changed, 6 insertions, 2 deletions
diff --git a/games/noteye/noteye.SlackBuild b/games/noteye/noteye.SlackBuild
index 6211ec8dc61c..f1008aee5a3f 100644
--- a/games/noteye/noteye.SlackBuild
+++ b/games/noteye/noteye.SlackBuild
@@ -6,6 +6,9 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20241107 bkw: BUILD=4, fix include path for luajit now that
+# luajit is 2.1.x: use pkg-config instead of hardcoding the path.
+
# 20241103 bkw: BUILD=3, fix include path for luajit. This was always
# wrong, but "masked" because luajit used to have REQUIRES=lua, so
# noteye would use the lua.h from lua, not luajit, and it happened to
@@ -28,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=noteye
VERSION=${VERSION:-8.4}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -94,7 +97,8 @@ patch -p1 < $CWD/sbo.diff
sed -i '/-lGLU *\$(TGT) *$/s,$, -lSDL2,' src/Makefile
# 20241103 bkw: fix include path for luajit.
-sed -i 's,-I/usr/include/lua5.1,-I/usr/include/luajit-2.0,' src/Makefile
+# 20241107 bkw: fix include path for luajit *correctly* this time.
+sed -i "s|-I/usr/include/lua5.1|$( pkg-config --cflags luajit )|" src/Makefile
# release tarball for 8.4 is missing this header (so use a copy
# from upstream's github)