kpriv
/
pkgsrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mujs: Update to 1.3.4 

Changes:

- Allow disabling readline support in Makefile.
- Handle sign when converting integer strings to numbers.
- Fix bug when cleaning up after allocation error.
- Finalize user data if object allocation fails.
This commit is contained in:
nia 2023-12-07 09:21:34 +00:00
parent 6d03dc5957
commit 67ff3b5441
3 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lang/mujs/Makefile
View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.6 2023/09/10 09:57:36 nia Exp $
# $NetBSD: Makefile,v 1.7 2023/12/07 09:21:34 nia Exp $
DISTNAME= mujs-1.3.3
PKGREVISION= 2
DISTNAME= mujs-1.3.4
CATEGORIES= lang
MASTER_SITES= https://mujs.com/downloads/

10
lang/mujs/distinfo
View File

@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.6 2023/09/10 09:57:36 nia Exp $
$NetBSD: distinfo,v 1.7 2023/12/07 09:21:34 nia Exp $
BLAKE2s (mujs-1.3.3.tar.gz) = b91373ed586938084ceaa6b90545fa580ea6f7efd9fecbd84ab50189b6fca943
SHA512 (mujs-1.3.3.tar.gz) = 74288484185473a813c55e08dcc2fefba46f87651d3a1fcea6ac843bb09a4150e13e0d46b348a34380a0defdeaa388cc93b6f7f569a7886091a34b4951b9461b
Size (mujs-1.3.3.tar.gz) = 128097 bytes
SHA1 (patch-Makefile) = 158e5ce3da4202b81ef2483ce594697660ae4263
BLAKE2s (mujs-1.3.4.tar.gz) = 8c2e5e0042b86f6e6c898ed881d92b8addb3f735a4d07f04f923da3922b53038
SHA512 (mujs-1.3.4.tar.gz) = 0806684be5e6dc3cb7305355ab7c7babbfd3fd5bbd22515659a88a82c25f3f4b6af14f7ca07bacd154823b19110b749bba68311c9f317dd684e0fd5628ece573
Size (mujs-1.3.4.tar.gz) = 128202 bytes
SHA1 (patch-Makefile) = a804b88721e4a48277e06f4f3d89b6c6f71eb76b

37
lang/mujs/patches/patch-Makefile
View File

@ -1,10 +1,10 @@
$NetBSD: patch-Makefile,v 1.6 2023/09/10 09:57:36 nia Exp $
$NetBSD: patch-Makefile,v 1.7 2023/12/07 09:21:34 nia Exp $
- Build shared objects at build-time rather than install-time.
- Honour CFLAGS and LDFLAGS.
- Libtoolize.
--- Makefile.orig 2023-01-10 11:11:11.000000000 +0000
--- Makefile.orig 2023-11-21 15:27:50.000000000 +0000
+++ Makefile
@@ -2,28 +2,18 @@
#
@ -39,40 +39,43 @@ $NetBSD: patch-Makefile,v 1.6 2023/09/10 09:57:36 nia Exp $
ifeq ($(shell uname),FreeBSD)
CFLAGS += -I/usr/local/include -L/usr/local/lib
@@ -90,18 +80,22 @@ build/debug/mujs: main.c build/debug/lib
@@ -95,18 +85,24 @@ build/debug/mujs: main.c build/debug/lib
build/debug/mujs-pp: pp.c build/debug/libmujs.o
$(CC) $(CFLAGS) -g -o $@ $^ -lm
-build/release/libmujs.$(SO): one.c $(SRCS) $(HDRS)
+build/release/libmujs.$(SO): build/release/one.lo $(SRCS) $(HDRS)
+build/release/libmujs.$(SO): build/release/one.lo
@mkdir -p $(@D)
- $(CC) $(CFLAGS) $(OPTIM) -fPIC -shared -o $@ one.c -lm
-build/release/libmujs.o: one.c $(SRCS) $(HDRS)
+ $(LIBTOOL) --mode=link --tag=CC --quiet $(CC) $(LDFLAGS) -rpath $(PREFIX)/lib -o $@ build/release/one.lo -lm
+build/release/one.lo: one.c $(SRCS) $(HDRS)
@mkdir -p $(@D)
- @mkdir -p $(@D)
- $(CC) $(CFLAGS) $(OPTIM) -c -o $@ one.c
-build/release/libmujs.a: build/release/libmujs.o
- $(AR) cr $@ $^
-build/release/mujs: main.c build/release/libmujs.o
- $(CC) $(CFLAGS) $(OPTIM) -o $@ $^ -lm -DHAVE_READLINE -lreadline
- $(CC) $(CFLAGS) $(OPTIM) -o $@ $^ -lm $(READLINE_CFLAGS) $(READLINE_LIBS)
-build/release/mujs-pp: pp.c build/release/libmujs.o
- $(CC) $(CFLAGS) $(OPTIM) -o $@ $^ -lm
+ $(LIBTOOL) --mode=compile --tag=CC --quiet $(CC) $(CFLAGS) -c -o $@ one.c
+build/release/main.lo: main.c $(SRCS) $(HDRS)
+ @mkdir -p $(@D)
+ $(LIBTOOL) --mode=compile --tag=CC --quiet $(CC) $(CFLAGS) -c -o $@ main.c
+build/release/pp.lo: pp.c $(SRCS) $(HDRS)
+ @mkdir -p $(@D)
+ $(LIBTOOL) --mode=compile --tag=CC --quiet $(CC) $(CFLAGS) -c -o $@ pp.c
+ $(LIBTOOL) --mode=link --tag=CC --quiet $(CC) $(LDFLAGS) -rpath $(PREFIX)/lib -o $@ $^ -lm
+
+build/release/mujs: build/release/main.lo build/release/one.lo
+ $(LIBTOOL) --mode=link --tag=CC --quiet $(CC) $(LDFLAGS) -o $@ $^ -lm -DHAVE_READLINE -lreadline
+ $(LIBTOOL) --mode=link --tag=CC --quiet $(CC) $(LDFLAGS) -o $@ $^ -lm $(READLINE_CFLAGS) $(READLINE_LIBS)
+
+build/release/mujs-pp: build/release/pp.lo build/release/one.lo
+ $(LIBTOOL) --mode=link --tag=CC --quiet $(CC) $(LDFLAGS) -o $@ $^ -lm
+
+build/release/main.lo: main.c $(SRCS) $(HDRS)
+ $(LIBTOOL) --mode=compile --tag=CC --quiet $(CC) $(CFLAGS) -c -o $@ $<
+
+build/release/pp.lo: pp.c $(SRCS) $(HDRS)
+ $(LIBTOOL) --mode=compile --tag=CC --quiet $(CC) $(CFLAGS) -c -o $@ $<
+
+build/release/one.lo: one.c $(SRCS) $(HDRS)
+ $(LIBTOOL) --mode=compile --tag=CC --quiet $(CC) $(CFLAGS) -c -o $@ $<
build/release/mujs.pc:
@mkdir -p $(@D)
@@ -119,14 +113,14 @@ install-common: build/release/mujs build
@@ -124,14 +120,14 @@ install-common: build/release/mujs build
install -d $(DESTDIR)$(bindir)
install -m 644 mujs.h $(DESTDIR)$(incdir)
install -m 644 build/release/mujs.pc $(DESTDIR)$(libdir)/pkgconfig