diff --git a/lang/quickjs/Makefile b/lang/quickjs/Makefile index 918632e5dc85..58beb0342dc0 100644 --- a/lang/quickjs/Makefile +++ b/lang/quickjs/Makefile @@ -1,37 +1,37 @@ PORTNAME= quickjs -DISTVERSION= 2025.04.26-20250709 +DISTVERSION= 2025.09.13-20251018 CATEGORIES= lang devel #MASTER_SITES= https://bellard.org/${PORTNAME}/ #DISTNAME= ${PORTNAME}-${DISTVERSION:S/./-/g} MAINTAINER= yuri@FreeBSD.org COMMENT= Embeddable Javascript interpreter in C WWW= https://bellard.org/quickjs/ LICENSE= MIT USES= compiler:c11 cpe gmake tar:xz USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= bellard -GH_TAGNAME= 1fdc768 +GH_TAGNAME= eb2c890 CPE_VENDOR= ${PORTNAME}_project CONFLICTS= quickjs TEST_TARGET= test .include .if ${CHOSEN_COMPILER_TYPE} == gcc post-patch: @${REINPLACE_CMD} -e 's/%%GCC_DEFAULT%%/${GCC_DEFAULT}/' \ ${WRKSRC}/Makefile .endif post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libquickjs.so .include diff --git a/lang/quickjs/distinfo b/lang/quickjs/distinfo index 2eff0e7e9753..a33990e930be 100644 --- a/lang/quickjs/distinfo +++ b/lang/quickjs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1752336175 -SHA256 (bellard-quickjs-2025.04.26-20250709-1fdc768_GH0.tar.gz) = f3b564d611909926a6895c53377ce72ecd61f797ac9b27dec8a728380c89abd7 -SIZE (bellard-quickjs-2025.04.26-20250709-1fdc768_GH0.tar.gz) = 592711 +TIMESTAMP = 1761910669 +SHA256 (bellard-quickjs-2025.09.13-20251018-eb2c890_GH0.tar.gz) = 7ff160803cb8aae7341c4157a9d6fcb56def8af37fcfbaeb5bb66d4201f95198 +SIZE (bellard-quickjs-2025.09.13-20251018-eb2c890_GH0.tar.gz) = 608298 diff --git a/lang/quickjs/files/patch-Makefile b/lang/quickjs/files/patch-Makefile index d4baa682dade..808e3655dddd 100644 --- a/lang/quickjs/files/patch-Makefile +++ b/lang/quickjs/files/patch-Makefile @@ -1,75 +1,75 @@ ---- Makefile.orig 2025-07-12 12:03:32.908750000 -0400 -+++ Makefile 2025-07-12 12:08:54.639258000 -0400 -@@ -98,6 +98,7 @@ +--- Makefile.orig 2025-10-18 10:04:12 UTC ++++ Makefile +@@ -102,6 +102,7 @@ ifdef CONFIG_CLANG HOST_CC=clang CC=$(CROSS_PREFIX)clang CFLAGS+=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d + CFLAGS += -fPIC CFLAGS += -Wextra CFLAGS += -Wno-sign-compare CFLAGS += -Wno-missing-field-initializers -@@ -212,9 +213,9 @@ +@@ -216,9 +217,9 @@ endif QJSC_CC=$(CC) QJSC=./qjsc$(EXE) endif -PROGS+=libquickjs.a +PROGS+=libquickjs.so ifdef CONFIG_LTO -PROGS+=libquickjs.lto.a +PROGS+=libquickjs.lto.so endif # examples -@@ -296,12 +297,12 @@ +@@ -300,12 +301,12 @@ endif LTOEXT= endif -libquickjs$(LTOEXT).a: $(QJS_LIB_OBJS) - $(AR) rcs $@ $^ +libquickjs$(LTOEXT).so: $(QJS_LIB_OBJS) + $(CC) -shared -Wl,-soname=$@.0 $(LDFLAGS) -o $@ $^ ifdef CONFIG_LTO -libquickjs.a: $(patsubst %.o, %.nolto.o, $(QJS_LIB_OBJS)) - $(AR) rcs $@ $^ +libquickjs.so: $(patsubst %.o, %.nolto.o, $(QJS_LIB_OBJS)) + $(CC) -shared -Wl,-soname=$@.0 $(LDFLAGS) -o $@ $^ endif # CONFIG_LTO libquickjs.fuzz.a: $(patsubst %.o, %.fuzz.o, $(QJS_LIB_OBJS)) -@@ -368,10 +369,14 @@ +@@ -372,10 +373,14 @@ install: all mkdir -p "$(DESTDIR)$(PREFIX)/bin" $(STRIP) qjs$(EXE) qjsc$(EXE) install -m755 qjs$(EXE) qjsc$(EXE) "$(DESTDIR)$(PREFIX)/bin" - mkdir -p "$(DESTDIR)$(PREFIX)/lib/quickjs" - install -m644 libquickjs.a "$(DESTDIR)$(PREFIX)/lib/quickjs" + mkdir -p "$(DESTDIR)$(PREFIX)/lib" + install -m644 libquickjs.so "$(DESTDIR)$(PREFIX)/lib/libquickjs.so.0.0.0" + install -l rs "$(DESTDIR)$(PREFIX)/lib/libquickjs.so.0.0.0" "$(DESTDIR)$(PREFIX)/lib/libquickjs.so" + install -l rs "$(DESTDIR)$(PREFIX)/lib/libquickjs.so.0.0.0" "$(DESTDIR)$(PREFIX)/lib/libquickjs.so.0" ifdef CONFIG_LTO - install -m644 libquickjs.lto.a "$(DESTDIR)$(PREFIX)/lib/quickjs" + install -m644 libquickjs.lto.so "$(DESTDIR)$(PREFIX)/lib/libquickjs.so.0.0.0" + install -l rs "$(DESTDIR)$(PREFIX)/lib/libquickjs.lto.so.0.0.0" "$(DESTDIR)$(PREFIX)/lib/libquickjs.lto.so" + install -l rs "$(DESTDIR)$(PREFIX)/lib/libquickjs.lto.so.0.0.0" "$(DESTDIR)$(PREFIX)/lib/libquickjs.lto.so.0" endif mkdir -p "$(DESTDIR)$(PREFIX)/include/quickjs" install -m644 quickjs.h quickjs-libc.h "$(DESTDIR)$(PREFIX)/include/quickjs" -@@ -396,7 +401,7 @@ +@@ -400,7 +405,7 @@ HELLO_MODULE_OPTS=-fno-string-normalize -fno-map -fno- HELLO_MODULE_OPTS=-fno-string-normalize -fno-map -fno-typedarray \ -fno-typedarray -fno-regexp -fno-json -fno-eval -fno-proxy \ -fno-date -m -examples/hello_module: $(QJSC) libquickjs$(LTOEXT).a $(HELLO_MODULE_SRCS) +examples/hello_module: $(QJSC) libquickjs$(LTOEXT).so $(HELLO_MODULE_SRCS) $(QJSC) $(HELLO_MODULE_OPTS) -o $@ $(HELLO_MODULE_SRCS) # use of an external C module (static compilation) -@@ -404,7 +409,7 @@ +@@ -408,7 +413,7 @@ test_fib.c: $(QJSC) examples/test_fib.js test_fib.c: $(QJSC) examples/test_fib.js $(QJSC) -e -M examples/fib.so,fib -m -o $@ examples/test_fib.js -examples/test_fib: $(OBJDIR)/test_fib.o $(OBJDIR)/examples/fib.o libquickjs$(LTOEXT).a +examples/test_fib: $(OBJDIR)/test_fib.o $(OBJDIR)/examples/fib.o libquickjs$(LTOEXT).so $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) examples/fib.so: $(OBJDIR)/examples/fib.pic.o diff --git a/lang/quickjs/files/patch-qjsc.c b/lang/quickjs/files/patch-qjsc.c index 70a5f7f886b6..b70d09c5e046 100644 --- a/lang/quickjs/files/patch-qjsc.c +++ b/lang/quickjs/files/patch-qjsc.c @@ -1,11 +1,11 @@ ---- qjsc.c.orig 2024-07-27 21:40:48 UTC +--- qjsc.c.orig 2025-10-18 10:04:12 UTC +++ qjsc.c -@@ -445,7 +445,7 @@ static int output_executable(const char *out_filename, +@@ -498,7 +498,7 @@ static int output_executable(const char *out_filename, if (dynamic_export) *arg++ = "-rdynamic"; *arg++ = cfilename; - snprintf(libjsname, sizeof(libjsname), "%s/libquickjs%s%s.a", + snprintf(libjsname, sizeof(libjsname), "%s/libquickjs%s%s.so", lib_dir, bn_suffix, lto_suffix); *arg++ = libjsname; *arg++ = "-lm";