From nobody Thu Jun 30 09:06:24 2022 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 0DD4B871872; Thu, 30 Jun 2022 09:06:25 +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 4LYXWN6wj4z3qsB; Thu, 30 Jun 2022 09:06:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656579985; 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=06n0uyVY+d3tNlSHJsz7icbOHK7JzvWAbiFk2a0t/gc=; b=VXzdB/e2H5l5IqPxRQ7NlbPyGsCdcKfmWghVgTzIlXA9zVJPfiltPsLK12NUi7KyfMqn/a CTguByq95eGy2SaEPd4VkGW3nJY/vaknOQM5xtGxarQta3IR55GWSicDIi+/oSBIdxVJDI bl/ZizlWrR49Gl56f4yjuuKRMdoe4qO5JFcfiOxLfeyRYti9X9bshg9r/duq5FpkZBSDQK Adv58HJfDmCJwz0PjD8Bl8vK5o4XC/Xzb1V8ab+QQbjCeeAYSF6A10DUWdIuzJy2WOWSxL gD+T7xyE8C0tz5EQ8wIq/vOuBXEoSD7A4iAALc2PaetwF+4hyvBVvwheuVvv6Q== 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 CDFA923754; Thu, 30 Jun 2022 09:06:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25U96Ono033386; Thu, 30 Jun 2022 09:06:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25U96On5033385; Thu, 30 Jun 2022 09:06:24 GMT (envelope-from git) Date: Thu, 30 Jun 2022 09:06:24 GMT Message-Id: <202206300906.25U96On5033385@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: bd97b63d8b5d - main - www/node: Fix patch on armv6 and armv7 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: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd97b63d8b5d81d2520c6a3b248b63e2d69be59e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656579985; 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=06n0uyVY+d3tNlSHJsz7icbOHK7JzvWAbiFk2a0t/gc=; b=YmRhd8yos/NAhfHDORmQvxmb7vcQeHWLZ/7dafD4RwMfCWEAPHFTay1GRq4Cr9Bdul6X3K qu0MeyAhbRBiVjZORqJ5654/aH2ZYT/fKhHQtkxpTwTvQfZ1caC72nA1Jl14jgcgrn1U3l yBSqLCnqV6ALD/sKS/D1ebezjC2GVR5gPKUE6D2CWlvui1fKB00vCePx3DSW+yJDf3IaUN bNjz0Ykas0oJzSgtSNeh7hY4xMWsEPtZepAaE26uNVMDM3ayTPygLJwekVS0gjkM/qjnb7 srH1kG50p52tuVgoRVedWpAx6lY2wxf8HyB0+dAVsGMuqK2Cx4ImFudISFLjJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656579985; a=rsa-sha256; cv=none; b=b2txEpQkQMA1Yr1Jtprv4DtXpBCznhMSssmIfgYodc+lXCNlsd6K4opwQtDZFXjCvRwhN3 JQpFbmSO1o4DTSEzUoO6qLrbb24otEacaZ5frpPKM4DBxfn9yWOuMbkDNaUqJRutK5wdqT KmxwMkbhgqjpMlrjF0XdYm6F+Xve5uxLViaG6B5GOPu7OOSQQmgz7Yjy9Y68IKuWK99z/9 oJETRIWdmwB/fuQori2V+E7KLU7BMLY8f9baO6rg/amM/P9QoqxFWdAYGLADlToVW7MCXU T519BYysyeFiqwJFvK4Ja7wcp6yLHmM8hKAomqF5EOZxBriBat2GH9UokYqO5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=bd97b63d8b5d81d2520c6a3b248b63e2d69be59e commit bd97b63d8b5d81d2520c6a3b248b63e2d69be59e Author: Joseph Mingrone AuthorDate: 2022-06-29 19:35:54 +0000 Commit: Joseph Mingrone CommitDate: 2022-06-30 09:01:15 +0000 www/node: Fix patch on armv6 and armv7 PR: 263590 Reported by: Robert Clausecker Sponsored by: The FreeBSD Foundation --- www/node/Makefile | 4 ---- ...-tools_v8__gypfiles_v8.gyp => patch-tools_v8__gypfiles_v8.gyp} | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/www/node/Makefile b/www/node/Makefile index af0e0319b3c8..902c57b1dea8 100644 --- a/www/node/Makefile +++ b/www/node/Makefile @@ -83,10 +83,6 @@ LIB_DEPENDS+= libbrotlidec.so:archivers/brotli \ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-common.gypi .endif -.if ${ARCH} == armv6 || ${ARCH} == armv7 -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-tools_v8__gypfiles_v8.gyp -.endif - .if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64 CONFIGURE_ARGS+=--openssl-no-asm .endif diff --git a/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp b/www/node/files/patch-tools_v8__gypfiles_v8.gyp similarity index 70% rename from www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp rename to www/node/files/patch-tools_v8__gypfiles_v8.gyp index 9749a96d68e5..374f77039af4 100644 --- a/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp +++ b/www/node/files/patch-tools_v8__gypfiles_v8.gyp @@ -1,11 +1,11 @@ ---- tools/v8_gypfiles/v8.gyp.orig 2021-04-20 11:30:16 UTC +--- tools/v8_gypfiles/v8.gyp.orig 2022-05-17 11:37:47 UTC +++ tools/v8_gypfiles/v8.gyp -@@ -774,7 +774,7 @@ +@@ -977,7 +977,7 @@ }], # Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library # to implement atomic memory access -- ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "arm", "riscv64"]', { -+ ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "riscv64"]', { +- ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "arm", "riscv64", "loong64"]', { ++ ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "riscv64", "loong64"]', { 'link_settings': { 'libraries': ['-latomic', ], },