From nobody Sat Nov 18 00:29:59 2023 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 4SXF6033W5z51XB0; Sat, 18 Nov 2023 00:30:00 +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 4SXF600Ydmz4Y4Z; Sat, 18 Nov 2023 00:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700267400; 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=zg2xn8VBZ6MsH5WJiwj824O3D4LifquNTJhW7IR/8/I=; b=rRWHUwSFDBq3bR1M/75aDAcXdXmcTAPXgyXrWqcgVL/Zy4jqChunljULJPECFUQmg463hP fuul0skgyOmtcRcofWN3lVWzlOBu63Ng/zCmQ/7vd6xwjIOG2vvRUbiMFC57xEup7eV7CO NhglibQZ99P66MUvvurPu26QPsyarT7vJl8mEMP72EaFeV1oUedxDn/7QWoOsh6DmpVIz7 Ug8x0yY1GCU6DAym5nNhqPGxWvmN0JEzNzTE0uN/ggW1HasMzSnJziOFQ8Fe54XW4UnC+3 FXExZd3iUdG5Hm2tnnQh7q2toVNVWUzRtSmY7z2qeGMCDwG9mkD6ZyCz2UjSXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700267400; 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=zg2xn8VBZ6MsH5WJiwj824O3D4LifquNTJhW7IR/8/I=; b=iR2MmS/liqDK7QkhWXaenk3AXx3CK0F27c5WoAnR9PWorYvfmz1g+lz8+uYhW2e7vjBIXZ lLsKwcU2DYclFwWmkZeWGkpx0YytbBon9bpQRxIyUW8jU2yTP/ngLcKOq0wZTl0l2ZxL4e X8GSTc5OKGQnnlXS9IQ8KrLsGYHc3WskKRWoTWbxIIllbhwMmeRQIC1rfzynunnueni2p/ ZunDtVHk0IlOiEEtCXUNAFg0L6I9v6bOH843ckZua5qFLJ3HWnCclQiCcxwUx1XN8ZvSEO YH4uOhY3RLdLAY1Kl0v0UsSeAonQ/cYNks+QDYa0IA2ZRTvR3c60A0IHicTwog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700267400; a=rsa-sha256; cv=none; b=IXCz2BVKLofdw7MzylWyCqRbG/jswIdL1sKJadZlgUePXerutGDiWnPEexaZVzy4kHvN2U XFZYLJa+Ry5Gpbv9LUWjD+Uc179IwIsfYF8w7l5sov2MBp8LRjR9qxsYqrPa8MDZg18Or1 rmE1mEDIHyApB3LkR71FQdQiIBdOa+Ssh3chCgK87Exs492X58wiGs/UqNQkZCo79qQjEu mFWfK8md8Y8MKGLfzvApD70pN8kifrvKaFJXQI/bXfRCWKBQqZaF1YezOxLLEIEZ5MVaey oBG8/RVKYtviuJd80ureJmwAYJlRHF2nYU+qcH2b/5UIGG7li3go8zcxWO0Leg== 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 4SXF5z6fPpz14n7; Sat, 18 Nov 2023 00:29:59 +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 3AI0Txxc012987; Sat, 18 Nov 2023 00:29:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AI0TxAB012984; Sat, 18 Nov 2023 00:29:59 GMT (envelope-from git) Date: Sat, 18 Nov 2023 00:29:59 GMT Message-Id: <202311180029.3AI0TxAB012984@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: ce99a9feeaab - main - www/node18: Remove DTrace support to fix build with upcoming binutils 2.41 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: ce99a9feeaab7628b8379ab5a59c115b87e0ecaa Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce99a9feeaab7628b8379ab5a59c115b87e0ecaa commit ce99a9feeaab7628b8379ab5a59c115b87e0ecaa Author: Yasuhiro Kimura AuthorDate: 2023-11-01 09:39:34 +0000 Commit: Yasuhiro Kimura CommitDate: 2023-11-18 00:27:13 +0000 www/node18: 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/node18/work/node-v18.18.2/out/Release/lib.host:/wrkdirs/usr/ports/www/node18/work/node-v18.18.2/out/Release/lib.target:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH; cd ../.; mkdir -p /wrkdirs/usr/ports/www/node18/work/node-v18.18.2/out/Release/obj.target/libnode/src; dtrace -64 "-I/wrkdirs/usr/ports/www/node18/work/node-v18.18.2/out/Release/obj/gen" -Isrc -C -G -s src/v8ustack.d -o "/wrkdirs/usr/ports/www/node18/work/node-v18.18.2/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: 274847 Approved by: maintainer timeout --- www/node18/Makefile | 13 ++----------- www/node18/pkg-plist | 1 - 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/www/node18/Makefile b/www/node18/Makefile index a21b5b8e7469..e890ce7f266b 100644 --- a/www/node18/Makefile +++ b/www/node18/Makefile @@ -1,5 +1,6 @@ PORTNAME= node PORTVERSION= ${NODEJS_PORTVERSION} +PORTREVISION= 1 DISTVERSIONPREFIX= v PORTREVISION= 1 CATEGORIES= www @@ -53,23 +54,13 @@ SHEBANG_FILES= deps/v8/third_party/inspector_protocol/*.py \ tools/*.py \ tools/inspector_protocol/*.py -OPTIONS_DEFINE= BUNDLED_SSL DOCS DTRACE NLS -OPTIONS_DEFAULT=DTRACE -.if !exists(/usr/sbin/dtrace) -OPTIONS_EXCLUDE+= DTRACE -.endif -OPTIONS_EXCLUDE_aarch64= DTRACE -OPTIONS_EXCLUDE_armv6= DTRACE -OPTIONS_EXCLUDE_armv7= DTRACE -OPTIONS_EXCLUDE_powerpc64= DTRACE -OPTIONS_EXCLUDE_powerpc64le= DTRACE +OPTIONS_DEFINE= BUNDLED_SSL DOCS NLS OPTIONS_SUB= yes BUNDLED_SSL_DESC= Use bundled OpenSSL implementation from node.js BUNDLED_SSL_CONFIGURE_OFF= --openssl-use-def-ca-store --shared-openssl BUNDLED_SSL_RUN_DEPENDS_OFF= ca_root_nss>=0:security/ca_root_nss BUNDLED_SSL_USES_OFF= ssl -DTRACE_CONFIGURE_ON= --with-dtrace NLS_BUILD_DEPENDS= icu>=69.1:devel/icu NLS_CONFIGURE_ON= --with-intl=system-icu NLS_LIB_DEPENDS= libicui18n.so:devel/icu diff --git a/www/node18/pkg-plist b/www/node18/pkg-plist index 7e299ce81986..e48d1fb30e30 100644 --- a/www/node18/pkg-plist +++ b/www/node18/pkg-plist @@ -2272,7 +2272,6 @@ include/node/v8-wasm.h include/node/v8-weak-callback-info.h include/node/v8.h include/node/v8config.h -%%DTRACE%%lib/dtrace/node.d lib/node_modules/corepack/CHANGELOG.md lib/node_modules/corepack/LICENSE.md lib/node_modules/corepack/README.md