diff options
author | davidovski <david@davidovski.xyz> | 2022-05-04 23:52:30 +0100 |
---|---|---|
committer | davidovski <david@davidovski.xyz> | 2022-05-04 23:52:30 +0100 |
commit | 739c65c54cb0e957df5e9b76f93fb02554e5cac3 (patch) | |
tree | 09ddfa0a342f3ea9de136cb50abdd79821bf1b53 /extra/lua-lpeg | |
parent | 4c585ad54388285500fd18a6aaa516894e0f2c16 (diff) |
moved everything to new file formatting
Diffstat (limited to 'extra/lua-lpeg')
-rw-r--r-- | extra/lua-lpeg/build-static-lib.patch | 29 | ||||
-rw-r--r-- | extra/lua-lpeg/test-fix-setlocale.patch | 20 |
2 files changed, 0 insertions, 49 deletions
diff --git a/extra/lua-lpeg/build-static-lib.patch b/extra/lua-lpeg/build-static-lib.patch deleted file mode 100644 index d8a8f8c..0000000 --- a/extra/lua-lpeg/build-static-lib.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/makefile -+++ b/makefile -@@ -24,12 +24,15 @@ - - CFLAGS = $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC - CC = gcc -+AR = ar -+RANLIB = ranlib - - FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o - - # For Linux - linux: - $(MAKE) lpeg.so "DLLFLAGS = -shared -fPIC" -+ $(MAKE) lpeg.a - - # For Mac OS - macosx: -@@ -37,6 +40,10 @@ - - lpeg.so: $(FILES) - env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so -+ -+lpeg.a: $(FILES) -+ env $(AR) rc lpeg.a $(FILES) -+ env $(RANLIB) lpeg.a - - $(FILES): makefile - diff --git a/extra/lua-lpeg/test-fix-setlocale.patch b/extra/lua-lpeg/test-fix-setlocale.patch deleted file mode 100644 index 028c18c..0000000 --- a/extra/lua-lpeg/test-fix-setlocale.patch +++ /dev/null @@ -1,20 +0,0 @@ -os.setlocale just calls setlocale() from libc and musl's implementation -behaves a bit differently in comparison with BSD libc or glibc. - -When particular locales for all categories are the same, e.g. "C", -`setlocale(LC_ALL, "")` returns just "C" on BSD libc (tested on macOS) -and glibc, but musl returns "C;C;C;C;C;C". When some locale is different, -e.g. LC_CTYPE, then on macOS you get "C/en_US.UTF-8/C/C/C/C", on glibc -"LC_CTYPE=en_US.UTF-8;LC_NUMERIC=C;...", on musl "en_US.UTF-8;C;C;C;C;C". - ---- a/test.lua -+++ b/test.lua -@@ -1428,7 +1428,7 @@ - - - -- testing pre-defined names --assert(os.setlocale("C") == "C") -+assert(os.setlocale("C"):sub(1, 1) == "C") - - function eqlpeggsub (p1, p2) - local s1 = cs2str(re.compile(p1)) |