From 4aa65c4c1c2f17f514d83c7d3f154ef184db7751 Mon Sep 17 00:00:00 2001 From: Robert Clausecker Date: Thu, 13 Feb 2025 14:27:49 +0100 Subject: [PATCH] lang/quickjs: add SONAME, library symlinks PR: 275087 MFH: no (soname change) Reported by: asiciliano Approved by: yuri --- lang/quickjs/Makefile | 4 ++-- lang/quickjs/distinfo | 6 +++--- lang/quickjs/files/patch-Makefile | 20 ++++++++++++-------- lang/quickjs/files/patch-qjsc.c | 4 ++-- lang/quickjs/pkg-plist | 2 ++ 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/lang/quickjs/Makefile b/lang/quickjs/Makefile index 6662e89c22af..2a5783bc4440 100644 --- a/lang/quickjs/Makefile +++ b/lang/quickjs/Makefile @@ -1,6 +1,6 @@ PORTNAME= quickjs DISTVERSION= 2024.01.13-20240727 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang devel #MASTER_SITES= https://bellard.org/${PORTNAME}/ #DISTNAME= ${PORTNAME}-${DISTVERSION:S/./-/g} @@ -16,7 +16,7 @@ USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= bellard -GH_TAGNAME= 6e2e68f +GH_TAGNAME= 6e2e68fd0896957f92eb6c242a2e048c1ef3cae0 CPE_VENDOR= ${PORTNAME}_project diff --git a/lang/quickjs/distinfo b/lang/quickjs/distinfo index b4364907ff46..68c3dc392c63 100644 --- a/lang/quickjs/distinfo +++ b/lang/quickjs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1731087975 -SHA256 (bellard-quickjs-2024.01.13-20240727-6e2e68f_GH0.tar.gz) = bdaa50a8d8e29b9df4b3b6b648c7b32325321293479c0a6dffbf80353fda2d2c -SIZE (bellard-quickjs-2024.01.13-20240727-6e2e68f_GH0.tar.gz) = 628343 +TIMESTAMP = 1739453157 +SHA256 (bellard-quickjs-2024.01.13-20240727-6e2e68fd0896957f92eb6c242a2e048c1ef3cae0_GH0.tar.gz) = 3ceab2edf529ffc4ed4111e613e6878c8ffa4ca792d66a989f6a05fa35f9ec59 +SIZE (bellard-quickjs-2024.01.13-20240727-6e2e68fd0896957f92eb6c242a2e048c1ef3cae0_GH0.tar.gz) = 628637 diff --git a/lang/quickjs/files/patch-Makefile b/lang/quickjs/files/patch-Makefile index fe0bbaddd998..b1bff599e9c6 100644 --- a/lang/quickjs/files/patch-Makefile +++ b/lang/quickjs/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2024-05-30 14:41:37 UTC +--- Makefile.orig 2024-07-27 21:40:48 UTC +++ Makefile @@ -94,6 +94,7 @@ ifdef CONFIG_CLANG HOST_CC=clang @@ -27,31 +27,35 @@ -libquickjs$(LTOEXT).a: $(QJS_LIB_OBJS) - $(AR) rcs $@ $^ +libquickjs$(LTOEXT).so: $(QJS_LIB_OBJS) -+ $(CC) -shared $(LDFLAGS) -o $@ $^ ++ $(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 $(LDFLAGS) -o $@ $^ ++ $(CC) -shared -Wl,-soname=$@.0 $(LDFLAGS) -o $@ $^ endif # CONFIG_LTO libquickjs.fuzz.a: $(patsubst %.o, %.fuzz.o, $(QJS_LIB_OBJS)) -@@ -384,10 +385,10 @@ install: all +@@ -384,10 +385,14 @@ install: all $(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" ++ 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" ++ 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 +418,7 @@ HELLO_MODULE_OPTS=-fno-string-normalize -fno-map -fno- +@@ -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 \ -fno-typedarray -fno-regexp -fno-json -fno-eval -fno-proxy \ -fno-date -m @@ -60,7 +64,7 @@ $(QJSC) $(HELLO_MODULE_OPTS) -o $@ $(HELLO_MODULE_SRCS) # use of an external C module (static compilation) -@@ -425,7 +426,7 @@ test_fib.c: $(QJSC) examples/test_fib.js +@@ -425,7 +430,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 diff --git a/lang/quickjs/files/patch-qjsc.c b/lang/quickjs/files/patch-qjsc.c index 292f0af889fd..70a5f7f886b6 100644 --- a/lang/quickjs/files/patch-qjsc.c +++ b/lang/quickjs/files/patch-qjsc.c @@ -1,6 +1,6 @@ ---- qjsc.c.orig 2023-10-23 23:25:39 UTC +--- qjsc.c.orig 2024-07-27 21:40:48 UTC +++ qjsc.c -@@ -446,7 +446,7 @@ static int output_executable(const char *out_filename, +@@ -445,7 +445,7 @@ static int output_executable(const char *out_filename, if (dynamic_export) *arg++ = "-rdynamic"; *arg++ = cfilename; diff --git a/lang/quickjs/pkg-plist b/lang/quickjs/pkg-plist index 5a70bf083b2b..b99dbd28945a 100644 --- a/lang/quickjs/pkg-plist +++ b/lang/quickjs/pkg-plist @@ -4,3 +4,5 @@ bin/qjscalc include/quickjs/quickjs-libc.h include/quickjs/quickjs.h lib/libquickjs.so +lib/libquickjs.so.0 +lib/libquickjs.so.0.0.0