From nobody Tue Jul 09 04:03:21 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WJ6m94mXBz5PfMH; Tue, 09 Jul 2024 04:03:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WJ6m941MFz4QF5; Tue, 9 Jul 2024 04:03:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720497801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+SFT93nl9U+DiN/sajyddhAJq/9yRST5KznCkyBh0Mw=; b=ya/bQJ47fD+QfLVfhzvuC96xJjuRfprlZ8qTnWHZG6yJOnMDBpGAcTcr4zVdBQ6Hm5AQ+d H8C08JTMC+EX0gBR6jsGvXXxSRdU/IGkyTy+xo2NS10FtyDTkkqjI2bF9WrhA4mhoff/Ru Sw7j+Q3O+ZffjqvciHmMm9JnePx8YT4CjpP3Q3edXHpDZZNTdhhhuTwAnaus8ydsFxVqVL NUBYbQd03p0H7U1Umno9NOrpCdZ5kHVk5X4HUbHsOJdHlAvBQaY1kd5WiU4nFUFH2gYtRa e88hSJ6vodIPmQDZ9FtahIQbqDpABy+YOYtrkAVCb94Gd/ul0cu29dE96hS8aA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720497801; a=rsa-sha256; cv=none; b=PyxqACAeOW0uGux2W8sGJSmO4Z+wqClQvDFY5uLNiBy/ixExHvXvU4Flu+3HUcVtoiAS6x qqgEN8AjrS65tQBR0y2XErALCCpBZUoswIYIM9/9NnGbYulD3jNULSDAkFcRg+N97cl0LX rqThc5TsxsdiuRN13SUUNQpg2+cksZ4Pn4yzKAphT2BZ79f1oafnMKl6o2JM3keYfF1jed 6qmgYXSWGNA1NuWyp08kUhMFvqc8zu7x1tEGAggfFDRQyNmbdUTFsG27Bptq9ewHSY2N5g VmrSv52tCQJ5B4EZkBAfqyEuTg50d4VJ4TmpFAo59aTXO+0x/GEbHevjPp97ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720497801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+SFT93nl9U+DiN/sajyddhAJq/9yRST5KznCkyBh0Mw=; b=pOG5l6jeiwM1wycuh4zAAQvIZhBWeE9o74d2ZHQkGO1W+Q24OHiK5nf6oOsRYJrML+yzSi cgynDWiDtL7mk/6A/3oiC+nWhehx9a3FH64lFd8LWzESCPgm8BEyWlpJHsRmhX84Mkh6tj vW4dATGN9HHnLK/HqlFGZE/nggHibT4nJT29FFzMXKlW5vJMFAqgKZJa3AemZuEDxr4eMI mLzYF7THldo0Cz5yI4VAg5K2qL0HKpUCZA6AGdEyn89k3CW38ZmJWtoZsgXUdRya1IbBAR Okj7S3o3nH+vFhgEeuJu4SeZ7CZLv2C/ozdpowioQo5CS4W2TAgfSEGSYvv8nw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WJ6m93c7xzK0L; Tue, 9 Jul 2024 04:03:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46943LCL093174; Tue, 9 Jul 2024 04:03:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46943LPo093171; Tue, 9 Jul 2024 04:03:21 GMT (envelope-from git) Date: Tue, 9 Jul 2024 04:03:21 GMT Message-Id: <202407090403.46943LPo093171@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: e24d86391a8e - main - lang/quickjs: update 2024.01.13 =?utf-8?Q?=E2=86=92?= 2024.01.13-20240530 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e24d86391a8ebf2524630c136e53b533c1958af3 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=e24d86391a8ebf2524630c136e53b533c1958af3 commit e24d86391a8ebf2524630c136e53b533c1958af3 Author: Yuri Victorovich AuthorDate: 2024-07-09 04:03:00 +0000 Commit: Yuri Victorovich CommitDate: 2024-07-09 04:03:00 +0000 lang/quickjs: update 2024.01.13 → 2024.01.13-20240530 --- lang/quickjs/Makefile | 12 +++++---- lang/quickjs/distinfo | 6 ++--- lang/quickjs/files/extra-clang-patch-Makefile | 25 ------------------- lang/quickjs/files/extra-gcc-patch-Makefile | 36 --------------------------- lang/quickjs/files/patch-Makefile | 22 ++++++++-------- lang/quickjs/files/patch-qjs.c | 11 -------- lang/quickjs/files/patch-quickjs-libc.c | 18 -------------- 7 files changed, 21 insertions(+), 109 deletions(-) diff --git a/lang/quickjs/Makefile b/lang/quickjs/Makefile index cf25ca6e8e1b..ec00a434325f 100644 --- a/lang/quickjs/Makefile +++ b/lang/quickjs/Makefile @@ -1,8 +1,8 @@ PORTNAME= quickjs -DISTVERSION= 2024.01.13 +DISTVERSION= 2024.01.13-20240530 CATEGORIES= lang devel -MASTER_SITES= https://bellard.org/${PORTNAME}/ -DISTNAME= ${PORTNAME}-${DISTVERSION:S/./-/g} +#MASTER_SITES= https://bellard.org/${PORTNAME}/ +#DISTNAME= ${PORTNAME}-${DISTVERSION:S/./-/g} MAINTAINER= yuri@FreeBSD.org COMMENT= Embeddable Javascript interpreter in C @@ -13,9 +13,11 @@ LICENSE= MIT USES= compiler:c11 cpe gmake tar:xz USE_LDCONFIG= yes -CPE_VENDOR= ${PORTNAME}_project +USE_GITHUB= yes +GH_ACCOUNT= bellard +GH_TAGNAME= 36911f0 -EXTRA_PATCHES= ${FILESDIR}/extra-${CHOSEN_COMPILER_TYPE}-patch-Makefile +CPE_VENDOR= ${PORTNAME}_project TEST_TARGET= test diff --git a/lang/quickjs/distinfo b/lang/quickjs/distinfo index 4a2d8a640c6b..a851e123223e 100644 --- a/lang/quickjs/distinfo +++ b/lang/quickjs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1720420387 -SHA256 (quickjs-2024-01-13.tar.xz) = 3c4bf8f895bfa54beb486c8d1218112771ecfc5ac3be1036851ef41568212e03 -SIZE (quickjs-2024-01-13.tar.xz) = 765800 +TIMESTAMP = 1720496813 +SHA256 (bellard-quickjs-2024.01.13-20240530-36911f0_GH0.tar.gz) = 8257ae687e2e542ba3205da9ec380ae2526e97434c17e5eac310fec66dec0f72 +SIZE (bellard-quickjs-2024.01.13-20240530-36911f0_GH0.tar.gz) = 628256 diff --git a/lang/quickjs/files/extra-clang-patch-Makefile b/lang/quickjs/files/extra-clang-patch-Makefile deleted file mode 100644 index d4014c7285af..000000000000 --- a/lang/quickjs/files/extra-clang-patch-Makefile +++ /dev/null @@ -1,25 +0,0 @@ ---- Makefile.orig 2019-09-18 18:34:20 UTC -+++ Makefile -@@ -25,6 +25,9 @@ - ifeq ($(shell uname -s),Darwin) - CONFIG_DARWIN=y - endif -+ifeq ($(shell uname -s),FreeBSD) -+CONFIG_FREEBSD=y -+endif - # Windows cross compilation from Linux - #CONFIG_WIN32=y - # use link time optimization (smaller and faster executables but slower build) -@@ -38,6 +41,12 @@ ifdef CONFIG_DARWIN - # use clang instead of gcc - CONFIG_CLANG=y - CONFIG_DEFAULT_AR=y -+endif -+ifdef CONFIG_FREEBSD -+# use clang instead of gcc -+CONFIG_CLANG=y -+CONFIG_DEFAULT_AR=y -+CONFIG_LTO= - endif - - # installation directory diff --git a/lang/quickjs/files/extra-gcc-patch-Makefile b/lang/quickjs/files/extra-gcc-patch-Makefile deleted file mode 100644 index bdaf4f8a3c7d..000000000000 --- a/lang/quickjs/files/extra-gcc-patch-Makefile +++ /dev/null @@ -1,36 +0,0 @@ ---- Makefile.orig 2020-09-06 09:31:51 UTC -+++ Makefile -@@ -25,6 +25,9 @@ - ifeq ($(shell uname -s),Darwin) - CONFIG_DARWIN=y - endif -+ifeq ($(shell uname -s),FreeBSD) -+CONFIG_FREEBSD=y -+endif - # Windows cross compilation from Linux - #CONFIG_WIN32=y - # use link time optimization (smaller and faster executables but slower build) -@@ -39,6 +42,12 @@ ifdef CONFIG_DARWIN - CONFIG_CLANG=y - CONFIG_DEFAULT_AR=y - endif -+ifdef CONFIG_FREEBSD -+# use clang instead of gcc -+CONFIG_CLANG= -+CONFIG_DEFAULT_AR=y -+CONFIG_LTO= -+endif - - # installation directory - prefix=/usr/local -@@ -81,8 +90,8 @@ ifdef CONFIG_CLANG - endif - endif - else -- HOST_CC=gcc -- CC=$(CROSS_PREFIX)gcc -+ HOST_CC=gcc%%GCC_DEFAULT%% -+ CC=$(CROSS_PREFIX)gcc%%GCC_DEFAULT%% - CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d - CFLAGS += -Wno-array-bounds -Wno-format-truncation - ifdef CONFIG_LTO diff --git a/lang/quickjs/files/patch-Makefile b/lang/quickjs/files/patch-Makefile index de339994472a..fe0bbaddd998 100644 --- a/lang/quickjs/files/patch-Makefile +++ b/lang/quickjs/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2024-07-08 06:33:18 UTC +--- Makefile.orig 2024-05-30 14:41:37 UTC +++ Makefile -@@ -79,6 +79,7 @@ ifdef CONFIG_CLANG +@@ -94,6 +94,7 @@ ifdef CONFIG_CLANG HOST_CC=clang CC=$(CROSS_PREFIX)clang CFLAGS+=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d @@ -8,7 +8,7 @@ CFLAGS += -Wextra CFLAGS += -Wno-sign-compare CFLAGS += -Wno-missing-field-initializers -@@ -178,9 +179,9 @@ endif +@@ -207,9 +208,9 @@ endif ifdef CONFIG_M32 PROGS+=qjs32 qjs32_s endif @@ -20,7 +20,7 @@ endif # examples -@@ -255,12 +256,12 @@ endif +@@ -298,12 +299,12 @@ endif LTOEXT= endif @@ -36,11 +36,11 @@ + $(CC) -shared $(LDFLAGS) -o $@ $^ endif # CONFIG_LTO - repl.c: $(QJSC) repl.js -@@ -331,10 +332,10 @@ install: all - $(STRIP) qjs qjsc - install -m755 qjs qjsc "$(DESTDIR)$(PREFIX)/bin" - ln -sf qjs "$(DESTDIR)$(PREFIX)/bin/qjscalc" + libquickjs.fuzz.a: $(patsubst %.o, %.fuzz.o, $(QJS_LIB_OBJS)) +@@ -384,10 +385,10 @@ 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" @@ -51,7 +51,7 @@ endif mkdir -p "$(DESTDIR)$(PREFIX)/include/quickjs" install -m644 quickjs.h quickjs-libc.h "$(DESTDIR)$(PREFIX)/include/quickjs" -@@ -364,7 +365,7 @@ HELLO_MODULE_OPTS=-fno-string-normalize -fno-map -fno- +@@ -417,7 +418,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 +60,7 @@ $(QJSC) $(HELLO_MODULE_OPTS) -o $@ $(HELLO_MODULE_SRCS) # use of an external C module (static compilation) -@@ -372,7 +373,7 @@ test_fib.c: $(QJSC) examples/test_fib.js +@@ -425,7 +426,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-qjs.c b/lang/quickjs/files/patch-qjs.c deleted file mode 100644 index 5af56c5da80e..000000000000 --- a/lang/quickjs/files/patch-qjs.c +++ /dev/null @@ -1,11 +0,0 @@ ---- qjs.c.orig 2020-09-06 09:31:51 UTC -+++ qjs.c -@@ -36,6 +36,8 @@ - #include - #elif defined(__linux__) - #include -+#elif defined(__FreeBSD__) -+#include - #endif - - #include "cutils.h" diff --git a/lang/quickjs/files/patch-quickjs-libc.c b/lang/quickjs/files/patch-quickjs-libc.c deleted file mode 100644 index 0decd5f412e1..000000000000 --- a/lang/quickjs/files/patch-quickjs-libc.c +++ /dev/null @@ -1,18 +0,0 @@ ---- quickjs-libc.c.orig 2020-09-06 09:31:51 UTC -+++ quickjs-libc.c -@@ -47,8 +47,14 @@ - #include - #include - --#if defined(__APPLE__) -+#if defined(__FreeBSD__) -+extern char **environ; -+#endif -+ -+#if defined(__APPLE__) || defined(__FreeBSD__) - typedef sig_t sighandler_t; -+#endif -+#if defined(__APPLE__) - #if !defined(environ) - #include - #define environ (*_NSGetEnviron())