From nobody Sat Nov 18 00:29:58 2023 X-Original-To: dev-commits-ports-all@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 4SXF5y75FCz51Xn6; Sat, 18 Nov 2023 00:29:58 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SXF5y6g68z4Y1y; Sat, 18 Nov 2023 00:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700267398; 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=h3MbgllHkEzTewegovapVINdavGn1OGQJSlpMKLfiTc=; b=wDBFxhE79ZXtyx87/YXWOuQEqUsUjC/2FSNv2FHz4SXD0uHyJsuEv8FuAAchiow63o4O5W Zxa8NVsLOPt9P97HhR8RwlrxecKKEKVcBcr7lic8kZN89fY89JZYr06/gRPIPD8QEal3Im WQZhGAlrOfffnXMZ49rYqIJWViLk4HU/mME0/OgMAmXu1FCrLNRMmsyOqDfJ7uYuW97Z6V 0wAoufbf7+3ggh5a7Crq4QRhZO5odPv/rSiJpXld410crkDhf4n4ZskYpLxc0/hS/CU52R 16nKzLODJ7jy9gahe2GNIf6BWqhlpHK3oRPVHHoKe3rFBLbDVsvopMdVhgJntQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700267398; 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=h3MbgllHkEzTewegovapVINdavGn1OGQJSlpMKLfiTc=; b=H0iGW94hiCxyQDOoAaZzzYPBX1nIl8rUfHSMwasgWDAs03i7a3R85avEhpmnblnphXVu+T V+Yegyvh9zMi/g7zdejRplAr293DbfpN0QqaIuqNZc+jvV7gpR+CZ6ndqv4z2a1u45HCqZ NdLa1eOOYx9+q9sUzV3cLjBf9tkKRClsZiphfkv0GAkq01ZlCCFlSLcUmDdvKgT1TckS4u AZdjLk8/cIHWqo0wrjY51zJGbBUQ40YSL3ofXCGHtov7t55FWWNowCMAUHJ5/gtcOtJIQs M890daAGVZoXIAZgSrZPZtjuLkopdk3uS8R5R2zW9iQTFajsEvOy5cifp0hugQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700267398; a=rsa-sha256; cv=none; b=BCHXzjjYLlQ7lyb90+/I7bogovbiUU/JVFXW2w3PTDs18qBNyOqsU9K2TUIJYbuxK1dFWm CiVoWV5h07UXf30IW9YN+d4WcIWHDEJUggv+vfmucntfld4PB6bMiONfJ4N5WGDCEeoeSf 99JcYs6jrvvCrwrwouzHZlsGyq2TR0M+XmsxFQOCeks+WvTiu59wuq5rS2lIXHB5rmabXL A33nO+XWrzw/GLCHirdvMTB1PQZpO3xsnT6XIYSEF9RgE8gOlUP7OwxmY5N7SqEjC59QKT yKH+4ye4YCKLj938zz/LS3XdXTYpLkvCqlUh4zkUaJT6PDVmNQKnWRxntrJt+g== 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 4SXF5y5YyFz14bc; Sat, 18 Nov 2023 00:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AI0TwQK012922; Sat, 18 Nov 2023 00:29:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AI0TwkF012919; Sat, 18 Nov 2023 00:29:58 GMT (envelope-from git) Date: Sat, 18 Nov 2023 00:29:58 GMT Message-Id: <202311180029.3AI0TwkF012919@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 441ef340afa6 - main - www/node16: Remove DTrace support to fix build with upcoming binutils 2.41 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 441ef340afa6dd362be8029998f3327917b0670e Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=441ef340afa6dd362be8029998f3327917b0670e commit 441ef340afa6dd362be8029998f3327917b0670e Author: Yasuhiro Kimura AuthorDate: 2023-11-01 09:00:55 +0000 Commit: Yasuhiro Kimura CommitDate: 2023-11-18 00:27:06 +0000 www/node16: Remove DTrace support to fix build with upcoming binutils 2.41 * With binutils 2.41 build fails as following. LD_LIBRARY_PATH=/wrkdirs/usr/ports/www/node16/work/node-v16.20.1/out/Release/lib.host:/wrkdirs/usr/ports/www/node16/work/node-v16.20.1/out/Release/lib.target:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH; cd ../.; mkdir -p /wrkdirs/usr/ports/www/node16/work/node-v16.20.1/out/Release/obj.target/libnode/src; dtrace -64 "-I/wrkdirs/usr/ports/www/node16/work/node-v16.20.1/out/Release/obj/gen" -Isrc -C -G -s src/v8ustack.d -o "/wrkdirs/usr/ports/www/node16/work/node-v16.20.1/out/Release/obj.target/libnode/src/node_dtrace_ustack.o" dtrace: failed to compile script src/v8ustack.d: line 1: failed to resolve V8DBG_SMITAG: Unknown variable name * This is because behaviour of objdump has changes with binutils 2.41. [1][2] * On upstream DTrace support itself has been removed with Node.js 19.x. * There is a pull request that says it fixes build error. [3] I tried it but unfortunately it doesn't work as is expected. * Upstream suggests me to remove DTrace support. [4] Reference: https://github.com/nodejs/node/issues/49991#issue-1920717730 [1] Reference: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0a3137ce4c4b38ee8 [2] Reference: https://github.com/nodejs/node/pull/49992 [3] Reference: https://github.com/nodejs/node/pull/49992#issuecomment-1784231190 [4] PR: 274846 Approved by: maintainer timeout --- www/node16/Makefile | 23 +++-------------------- www/node16/pkg-plist | 1 - 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/www/node16/Makefile b/www/node16/Makefile index 689c238837ec..266c7beb34e6 100644 --- a/www/node16/Makefile +++ b/www/node16/Makefile @@ -1,7 +1,7 @@ PORTNAME= node DISTVERSIONPREFIX= v DISTVERSION= 16.20.1 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= www MASTER_SITES= https://nodejs.org/dist/v${DISTVERSION}/ PKGNAMESUFFIX= 16 @@ -63,19 +63,8 @@ CONFLICTS_INSTALL= node[0-9][0-9] REINPLACE_ARGS= -i '' PORTSCOUT= limit:^16\. -OPTIONS_DEFINE= BUNDLED_SSL COREPACK DOCS DTRACE NLS -OPTIONS_DEFAULT= COREPACK DTRACE - -.if !exists(/usr/sbin/dtrace) -OPTIONS_EXCLUDE+= DTRACE -.endif - -OPTIONS_EXCLUDE_aarch64= DTRACE -# dt_modtext:/usr/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c(820): arm not implemented -OPTIONS_EXCLUDE_armv6= DTRACE -OPTIONS_EXCLUDE_armv7= DTRACE -OPTIONS_EXCLUDE_powerpc64= DTRACE -OPTIONS_EXCLUDE_powerpc64le= DTRACE +OPTIONS_DEFINE= BUNDLED_SSL COREPACK DOCS NLS +OPTIONS_DEFAULT= COREPACK OPTIONS_SUB= yes @@ -89,8 +78,6 @@ BUNDLED_SSL_CONFIGURE_OFF= --openssl-use-def-ca-store \ COREPACK_CONFIGURE_OFF= --without-corepack -DTRACE_CONFIGURE_ON= --with-dtrace - NLS_BUILD_DEPENDS= icu>=69.1:devel/icu NLS_LIB_DEPENDS= libicui18n.so:devel/icu NLS_CONFIGURE_ON= --with-intl=system-icu @@ -133,8 +120,4 @@ post-install: ${RM} -rf ${STAGEDIR}${PREFIX}/share/systemtap ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node -post-install-DTRACE-on: - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/dtrace - ${INSTALL_DATA} ${WRKSRC}/out/Release/node.d ${STAGEDIR}${PREFIX}/lib/dtrace - .include diff --git a/www/node16/pkg-plist b/www/node16/pkg-plist index 304e152d53be..c88e9cf03dfc 100644 --- a/www/node16/pkg-plist +++ b/www/node16/pkg-plist @@ -513,7 +513,6 @@ include/node/v8-profiler.h include/node/v8-version.h include/node/v8.h include/node/v8config.h -%%DTRACE%%lib/dtrace/node.d %%COREPACK%%lib/node_modules/corepack/CHANGELOG.md %%COREPACK%%lib/node_modules/corepack/LICENSE.md %%COREPACK%%lib/node_modules/corepack/README.md