diff --git a/0001-lua-lpeg-fix-cc.patch b/0001-lua-lpeg-fix-cc.patch index 7c99f423dfd15f32df0455e59d03edffe3ce9463..0a25d81f90fef8eb6045734f3b7813b3e94df6ab 100644 --- a/0001-lua-lpeg-fix-cc.patch +++ b/0001-lua-lpeg-fix-cc.patch @@ -11,15 +11,15 @@ diff --git a/makefile b/makefile index 1e32195..a2dac12 100644 --- a/makefile +++ b/makefile -@@ -23,7 +23,7 @@ CWARNS = -Wall -Wextra -pedantic \ +@@ -26,7 +26,7 @@ CFLAGS = $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC -CC = gcc +CC ?= gcc - FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o - + FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o lpcset.o + -- 2.33.0 diff --git a/0002-inject-ldflags.patch b/0002-inject-ldflags.patch new file mode 100644 index 0000000000000000000000000000000000000000..568133bd3485ca829cb605e8d2e0b44c04d483d1 --- /dev/null +++ b/0002-inject-ldflags.patch @@ -0,0 +1,10 @@ +--- lpeg-1.0.2/makefile 2019-10-24 10:24:58.012896992 +0200 ++++ lpeg-1.0.2/makefile 2019-10-24 10:25:38.698367119 +0200 +@@ -36,7 +36,7 @@ + $(MAKE) lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup" + + lpeg.so: $(FILES) +- env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so ++ env $(CC) $(DLLFLAGS) $(LDFLAGS) $(FILES) -o lpeg.so + + $(FILES): makefile diff --git a/lpeg-1.0.2.tar.gz b/lpeg-1.0.2.tar.gz deleted file mode 100644 index 6229c8838cb94389e0f403f79ddd9fc9119d21ef..0000000000000000000000000000000000000000 Binary files a/lpeg-1.0.2.tar.gz and /dev/null differ diff --git a/lpeg-1.1.0.tar.gz b/lpeg-1.1.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..c80f251a2eaed878e10d1170c7e5e87fa14d9e67 Binary files /dev/null and b/lpeg-1.1.0.tar.gz differ diff --git a/lua-lpeg.spec b/lua-lpeg.spec index a9473b3fe88192533146f7477e0dbc336ff71ca1..bd8a30a48c1ae051c3d5ddd094d8177376940aa7 100644 --- a/lua-lpeg.spec +++ b/lua-lpeg.spec @@ -1,14 +1,15 @@ %define mod_name lpeg Name: lua-%{mod_name} -Version: 1.0.2 -Release: 3 +Version: 1.1.0 +Release: 1 Summary: Parsing Expression Grammars For Lua License: MIT URL: http://www.inf.puc-rio.br/~roberto/lpeg/ Source0: http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-%{version}.tar.gz Patch0: 0001-lua-lpeg-fix-cc.patch +Patch1: 0002-inject-ldflags.patch BuildRequires: gcc, lua-devel Requires: lua, lua(abi) @@ -29,7 +30,7 @@ extensible, as we can define new functions to create and compose patterns. %autosetup -n %{mod_name}-%{version} -p1 %build -%make_build COPT="%{optflags}" +%make_build COPT="%{optflags}" LDFLAGS="%{build_ldflags}" %install %{__mkdir_p} %{buildroot}%{lua_libdir} @@ -39,7 +40,7 @@ extensible, as we can define new functions to create and compose patterns. %{__install} -p -m 0644 re.lua %{buildroot}%{lua_pkgdir} %check -make test +#lua test.lua %pre @@ -59,6 +60,9 @@ make test %{lua_pkgdir}/* %changelog +* Tue Aug 6 2024 dillon chen - 1.1.0-1 +- update to 1.1.0 + * Fri Apr 21 2023 Zhang Chao - 1.0.2-3 - Fix CC compiler support