diff --git a/lang/quickjs/Makefile b/lang/quickjs/Makefile index 0a382adc5215..918632e5dc85 100644 --- a/lang/quickjs/Makefile +++ b/lang/quickjs/Makefile @@ -1,37 +1,37 @@ PORTNAME= quickjs -DISTVERSION= 2025.04.26-20250426 +DISTVERSION= 2025.04.26-20250709 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= 6e2e68fd0896957f92eb6c242a2e048c1ef3cae0 +GH_TAGNAME= 1fdc768 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 7637f8f4e79b..2eff0e7e9753 100644 --- a/lang/quickjs/distinfo +++ b/lang/quickjs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1746485237 -SHA256 (bellard-quickjs-2025.04.26-20250426-6e2e68fd0896957f92eb6c242a2e048c1ef3cae0_GH0.tar.gz) = 3ceab2edf529ffc4ed4111e613e6878c8ffa4ca792d66a989f6a05fa35f9ec59 -SIZE (bellard-quickjs-2025.04.26-20250426-6e2e68fd0896957f92eb6c242a2e048c1ef3cae0_GH0.tar.gz) = 628637 +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 diff --git a/lang/quickjs/files/patch-Makefile b/lang/quickjs/files/patch-Makefile index b1bff599e9c6..d4baa682dade 100644 --- a/lang/quickjs/files/patch-Makefile +++ b/lang/quickjs/files/patch-Makefile @@ -1,75 +1,75 @@ ---- Makefile.orig 2024-07-27 21:40:48 UTC -+++ Makefile -@@ -94,6 +94,7 @@ ifdef CONFIG_CLANG +--- Makefile.orig 2025-07-12 12:03:32.908750000 -0400 ++++ Makefile 2025-07-12 12:08:54.639258000 -0400 +@@ -98,6 +98,7 @@ 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 -@@ -207,9 +208,9 @@ endif - ifdef CONFIG_M32 - PROGS+=qjs32 qjs32_s +@@ -212,9 +213,9 @@ + 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 -@@ -298,12 +299,12 @@ endif +@@ -296,12 +297,12 @@ 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)) -@@ -384,10 +385,14 @@ install: all +@@ -368,10 +369,14 @@ + mkdir -p "$(DESTDIR)$(PREFIX)/bin" $(STRIP) qjs$(EXE) qjsc$(EXE) install -m755 qjs$(EXE) qjsc$(EXE) "$(DESTDIR)$(PREFIX)/bin" - ln -sf qjs$(EXE) "$(DESTDIR)$(PREFIX)/bin/qjscalc$(EXE)" - 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" -@@ -417,7 +422,7 @@ HELLO_MODULE_OPTS=-fno-string-normalize -fno-map -fno- - HELLO_MODULE_OPTS=-fno-string-normalize -fno-map -fno-promise -fno-typedarray \ +@@ -396,7 +401,7 @@ + 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) -@@ -425,7 +430,7 @@ test_fib.c: $(QJSC) examples/test_fib.js +@@ -404,7 +409,7 @@ 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/pkg-plist b/lang/quickjs/pkg-plist index b99dbd28945a..58c98df8f769 100644 --- a/lang/quickjs/pkg-plist +++ b/lang/quickjs/pkg-plist @@ -1,8 +1,7 @@ bin/qjs bin/qjsc -bin/qjscalc include/quickjs/quickjs-libc.h include/quickjs/quickjs.h lib/libquickjs.so lib/libquickjs.so.0 lib/libquickjs.so.0.0.0