CVS commit: pkgsrc/lang/lua54

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Oct 27 13:02:41 UTC 2021

Modified Files:
        pkgsrc/lang/lua54: Makefile distinfo
        pkgsrc/lang/lua54/patches: patch-src_Makefile

Log Message:
lua54: Include correct objects in luac binary

Problem and solution identified by Piotr Meyer in a private email,
thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/lua54/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/lua54/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/lua54/patches/patch-src_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/lua54/Makefile
diff -u pkgsrc/lang/lua54/Makefile:1.2 pkgsrc/lang/lua54/Makefile:1.3
--- pkgsrc/lang/lua54/Makefile:1.2      Thu Jul  2 10:15:20 2020
+++ pkgsrc/lang/lua54/Makefile  Wed Oct 27 13:02:40 2021
@@ -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/
 

Index: pkgsrc/lang/lua54/distinfo
diff -u pkgsrc/lang/lua54/distinfo:1.7 pkgsrc/lang/lua54/distinfo:1.8
--- pkgsrc/lang/lua54/distinfo:1.7      Tue Oct 26 10:51:42 2021
+++ pkgsrc/lang/lua54/distinfo  Wed Oct 27 13:02:40 2021
@@ -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

Index: pkgsrc/lang/lua54/patches/patch-src_Makefile
diff -u pkgsrc/lang/lua54/patches/patch-src_Makefile:1.3 pkgsrc/lang/lua54/patches/patch-src_Makefile:1.4
--- pkgsrc/lang/lua54/patches/patch-src_Makefile:1.3    Fri Apr  9 14:18:12 2021
+++ pkgsrc/lang/lua54/patches/patch-src_Makefile        Wed Oct 27 13:02:40 2021
@@ -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/0
  
  $(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