summaryrefslogtreecommitdiff
path: root/lang/lua54
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2021-10-27 13:02:40 +0000
committernia <nia@pkgsrc.org>2021-10-27 13:02:40 +0000
commit96060a5805ec651293519ced93395116a22932af (patch)
tree55946b09412db0054d6b37601f4b153ad5b22048 /lang/lua54
parent3e1b3fdbaaf2f4d4fd3bdef4dc0a5c3fbf143449 (diff)
downloadpkgsrc-96060a5805ec651293519ced93395116a22932af.tar.gz
lua54: Include correct objects in luac binary
Problem and solution identified by Piotr Meyer in a private email, thanks.
Diffstat (limited to 'lang/lua54')
-rw-r--r--lang/lua54/Makefile3
-rw-r--r--lang/lua54/distinfo4
-rw-r--r--lang/lua54/patches/patch-src_Makefile4
3 files changed, 6 insertions, 5 deletions
diff --git a/lang/lua54/Makefile b/lang/lua54/Makefile
index 00c4d7e0914..374bbf97c00 100644
--- a/lang/lua54/Makefile
+++ b/lang/lua54/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2020/07/02 10:15:20 nia Exp $
+# $NetBSD: Makefile,v 1.3 2021/10/27 13:02:40 nia Exp $
DISTNAME= lua-${LUA_VERSION}
PKGNAME= lua54-${LUA_VERSION}
+PKGREVISION= 1
CATEGORIES= lang lua
MASTER_SITES= https://www.lua.org/ftp/
diff --git a/lang/lua54/distinfo b/lang/lua54/distinfo
index 79d053463ce..292d7d00a5c 100644
--- a/lang/lua54/distinfo
+++ b/lang/lua54/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:51:42 nia Exp $
+$NetBSD: distinfo,v 1.8 2021/10/27 13:02:40 nia Exp $
BLAKE2s (lua-5.4.3.tar.gz) = e137cfcfdc6a93e52120039bec5f92db06dbe8318350fe88fc3a11626d4aa193
SHA512 (lua-5.4.3.tar.gz) = 3a1a3ee8694b72b4ec9d3ce76705fe179328294353604ca950c53f41b41161b449877d43318ef4501fee44ecbd6c83314ce7468d7425ba9b2903c9c32a28bbc0
Size (lua-5.4.3.tar.gz) = 358216 bytes
SHA1 (patch-Makefile) = 22523bc60fe8d004f3bfd59396cfc6e43f645a75
-SHA1 (patch-src_Makefile) = 2fabdb027ae3fcd31c2c65cfe9f9633a583c41d7
+SHA1 (patch-src_Makefile) = ab840599eea7303a015a9d7a303e99cb162d81bd
diff --git a/lang/lua54/patches/patch-src_Makefile b/lang/lua54/patches/patch-src_Makefile
index 72eb46096c8..c84b5ed7628 100644
--- a/lang/lua54/patches/patch-src_Makefile
+++ b/lang/lua54/patches/patch-src_Makefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_Makefile,v 1.3 2021/04/09 14:18:12 nia Exp $
+$NetBSD: patch-src_Makefile,v 1.4 2021/10/27 13:02:40 nia Exp $
- Don't override CC/CFLAGS/LDFLAGS.
- Use libtool to build shared libraries.
@@ -58,7 +58,7 @@ $NetBSD: patch-src_Makefile,v 1.3 2021/04/09 14:18:12 nia Exp $
$(LUAC_T): $(LUAC_O) $(LUA_A)
- $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
-+ $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
++ $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) -static -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
test:
./$(LUA_T) -v