Sun Sep 10 08:40:51 2023 UTC ()
lua-stringy: c89 default is unacceptable


(nia)
diff -r1.4 -r1.5 pkgsrc/textproc/lua-stringy/distinfo
diff -r1.1 -r1.2 pkgsrc/textproc/lua-stringy/patches/patch-stringy_Makefile
cvs diff -r1.4 -r1.5 pkgsrc/textproc/lua-stringy/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/lua-stringy/distinfo 2021/10/26 11:22:20 1.4
+++ pkgsrc/textproc/lua-stringy/distinfo 2023/09/10 08:40:51 1.5
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.4 2021/10/26 11:22:20 nia Exp $ 1$NetBSD: distinfo,v 1.5 2023/09/10 08:40:51 nia Exp $
2 2
3BLAKE2s (lua-stringy-0.7.0.tar.gz) = a6b28c801c59ebdea6a7e9b3a9552f9150388c9b7beddeec510df97a88d05e21 3BLAKE2s (lua-stringy-0.7.0.tar.gz) = a6b28c801c59ebdea6a7e9b3a9552f9150388c9b7beddeec510df97a88d05e21
4SHA512 (lua-stringy-0.7.0.tar.gz) = e23ea0f04bd4c1db8fe3fdda2d8fb4a18e78b82aadc12edf1114b29b18b68d981f7d304ccd1823711e7cc6dc586694f0d902faba41a91387319a1ceefc29e116 4SHA512 (lua-stringy-0.7.0.tar.gz) = e23ea0f04bd4c1db8fe3fdda2d8fb4a18e78b82aadc12edf1114b29b18b68d981f7d304ccd1823711e7cc6dc586694f0d902faba41a91387319a1ceefc29e116
5Size (lua-stringy-0.7.0.tar.gz) = 6213 bytes 5Size (lua-stringy-0.7.0.tar.gz) = 6213 bytes
6SHA1 (patch-stringy_Makefile) = de1abbb4e5c5a4b805caea58bd88b1ed4eeff0ae 6SHA1 (patch-stringy_Makefile) = ce1c43843c0cd828f01ba9b1e66dcd33be7927f6
7SHA1 (patch-stringy_stringy.c) = a984b24ec331fc0188b95a119c923f443e08b8a3 7SHA1 (patch-stringy_stringy.c) = a984b24ec331fc0188b95a119c923f443e08b8a3
cvs diff -r1.1 -r1.2 pkgsrc/textproc/lua-stringy/patches/patch-stringy_Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/lua-stringy/patches/patch-stringy_Makefile 2020/07/08 11:54:53 1.1
+++ pkgsrc/textproc/lua-stringy/patches/patch-stringy_Makefile 2023/09/10 08:40:51 1.2
@@ -1,27 +1,28 @@ @@ -1,27 +1,28 @@
1$NetBSD: patch-stringy_Makefile,v 1.1 2020/07/08 11:54:53 nia Exp $ 1$NetBSD: patch-stringy_Makefile,v 1.2 2023/09/10 08:40:51 nia Exp $
2 2
3- Append CFLAGS. 3- Append CFLAGS. Uses for loop initial declarations, c89 default
 4 is unacceptable.
4- Use LDFLAGS when linking. 5- Use LDFLAGS when linking.
5- Don't try to run tests. 6- Don't try to run tests.
6 7
7--- stringy/Makefile.orig 2019-03-22 19:12:17.000000000 +0000 8--- stringy/Makefile.orig 2019-03-22 19:12:17.000000000 +0000
8+++ stringy/Makefile 9+++ stringy/Makefile
9@@ -2,7 +2,7 @@ LUA ?= lua5.1 10@@ -2,7 +2,7 @@ LUA ?= lua5.1
10 LUA_PC ?= lua5.1 11 LUA_PC ?= lua5.1
11 LUA_CFLAGS = $(shell pkg-config $(LUA_PC) --cflags) 12 LUA_CFLAGS = $(shell pkg-config $(LUA_PC) --cflags)
12  13
13-CFLAGS ?= -O3 -Wall -Werror 14-CFLAGS ?= -O3 -Wall -Werror
14+CFLAGS += -Wall 15+CFLAGS += -std=c99 -Wall
15  16
16 all: stringy.so 17 all: stringy.so
17  18
18@@ -12,8 +12,7 @@ all: stringy.so 19@@ -12,8 +12,7 @@ all: stringy.so
19 stringy.o: fastsearch.h 20 stringy.o: fastsearch.h
20  21
21 stringy.so: stringy.o stringy_test.lua 22 stringy.so: stringy.o stringy_test.lua
22- $(CC) -shared stringy.o -o $@ 23- $(CC) -shared stringy.o -o $@
23- $(LUA) stringy_test.lua 24- $(LUA) stringy_test.lua
24+ $(CC) $(LDFLAGS) -shared stringy.o -o $@ 25+ $(CC) $(LDFLAGS) -shared stringy.o -o $@
25  26
26 clean: 27 clean:
27 rm -f stringy.so stringy.o *.rock 28 rm -f stringy.so stringy.o *.rock