From nobody Tue Nov 14 18:37:27 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 4SVFQb3cKnz50Wh6; Tue, 14 Nov 2023 18:37:27 +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 4SVFQb31d5z4H18; Tue, 14 Nov 2023 18:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699987047; 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=tzexe+PaQkkbqn7SSnL9IrEJhEbxpjDOb8IFDkcqIlk=; b=dP7RiavHCaoxTYg0TE22ifwIeOVNvcl/ygRsmTWPxRX2gzDjhtGNDUO93g2uaVKYNUsEC3 lWpEh/oK1fB4nnbV8mR0mTE3MOqryAqaStN9Ld7jPlEFO9P7xIuoQsXiEK/bFO9ip1DDGo QIkOZB9Zd+FI4VyzAvgFxeeDXlfXAx7G2AcuY51GwN6wa7+Ta9KVwrzlPPAE31DvDrsULi B8AGKgZxqrNaBmmJeTfOkWE6cTDchA4ZmMExjG8iJKdPZ7KUdF5fVSugZXyxjysRy45UZ9 4o1XrEKZuvrRALRFjvvJPLuC5LhugB9d38xzi1ZyX9dxdNRbpPruIjBI0rchuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699987047; 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=tzexe+PaQkkbqn7SSnL9IrEJhEbxpjDOb8IFDkcqIlk=; b=mz4Kro2rj8IH7Jdll6aqlNKagCvQ7IZwyglwFZZTn36yzWswQJK2xZyfG35X/0I74gD3er EPuiTAAYsEH8kj1gfTbFKiZYqZHrwQbYNt3ha2p7PDrO8l75nBqibDK7r12maLNE0Sl8aI oMEbag/7MB4GByDki5GabzWHFSSte1DGwLxNHlXBQtyiMQqRPOKlWTPMY3u44QChaQ8HFt aM7YllXuAjZpYaS0g2PYuX8zzN4PJCGaM0cni9Y69wJXusABzu01NvrzS/yIwON2YfghxF ZlawXxuZJZdoLhdlXAEreoHxwFVUnqqyf2pesSgQSdAH4QB+29ahS8hRdbKnrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699987047; a=rsa-sha256; cv=none; b=puS0muD2TO8y0rdH7z8KZaDYL6nuuCOiVmphWAbXsCiHq01O33HK8Ymr6fefFk4GEAhZwR wk+v/rzF7Xxn8vIdLBCK+PeR+IpINzRHBlfGwBJU4qd1MnPsqnuBumBziIE5TetGbz7kSM 8Yj/jQoVWpKvRk89fOClR6GlVE8Ov+afSGbd/nUGLIOsDU9FOxdrtlv1t0Yr5CYIlbuzpA xYGMmbTk6FAr7zWz7GqALVQ+Ny47ca2bEbdd11mybeT3GZzERFVatvin6OvNihU0mbwpgN Hv6kxY/aKVes6qLJNhZYUw6kmMhrM8hvCTjmJTOH5Oj5OKqtPyP6K2WWFu4HbQ== 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 4SVFQb23XRz10WQ; Tue, 14 Nov 2023 18:37:27 +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 3AEIbRpu005144; Tue, 14 Nov 2023 18:37:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AEIbRdw005141; Tue, 14 Nov 2023 18:37:27 GMT (envelope-from git) Date: Tue, 14 Nov 2023 18:37:27 GMT Message-Id: <202311141837.3AEIbRdw005141@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 9aaa7b5157c9 - main - Uses/electronfix.mk: Add an additional stage-qa step to find non-native Node modules. 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9aaa7b5157c9c9402ff43b8f4b68fa2cd2a7f412 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=9aaa7b5157c9c9402ff43b8f4b68fa2cd2a7f412 commit 9aaa7b5157c9c9402ff43b8f4b68fa2cd2a7f412 Author: Gleb Popov AuthorDate: 2023-11-14 18:34:37 +0000 Commit: Gleb Popov CommitDate: 2023-11-14 18:37:23 +0000 Uses/electronfix.mk: Add an additional stage-qa step to find non-native Node modules. Sponsored by: Serenity Cybersecurity, LLC --- Mk/Uses/electronfix.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Mk/Uses/electronfix.mk b/Mk/Uses/electronfix.mk index f2655c634bf5..274d19a07a6c 100644 --- a/Mk/Uses/electronfix.mk +++ b/Mk/Uses/electronfix.mk @@ -31,6 +31,8 @@ _ELECTRONFIX_MK_VERSION= ${_ver} . endif . endfor +. include "${.CURDIR}/../../devel/electron${_ELECTRONFIX_MK_VERSION}/Makefile.version" + BUILD_DEPENDS+= electron${_ELECTRONFIX_MK_VERSION}:devel/electron${_ELECTRONFIX_MK_VERSION} RUN_DEPENDS+= electron${_ELECTRONFIX_MK_VERSION}:devel/electron${_ELECTRONFIX_MK_VERSION} @@ -47,6 +49,10 @@ ELECTRONFIX_SYMLINK_FILES?= \ _USES_install= 701:electronfix-post-install +. if defined(DEVELOPER) +_USES_stage= 995:electronfix-stage-qa +. endif + electronfix-post-install: ${RM} ${STAGEDIR}${DATADIR}/chrome-sandbox ${RM} ${STAGEDIR}${DATADIR}/libvulkan.so.1 @@ -58,4 +64,9 @@ electronfix-post-install: # We have to copy the electron binary instead of symlinking ${CP} ${LOCALBASE}/share/electron${_ELECTRONFIX_MK_VERSION}/electron ${STAGEDIR}${DATADIR}/${ELECTRONFIX_MAIN_EXECUTABLE} . endif + +electronfix-stage-qa: + @${ECHO_CMD} "====> Checking for non-FreeBSD ELF binaries" + @${FIND} ${STAGEDIR}${DATADIR} -type f -exec brandelf {} ';' 2> /dev/null | grep -v "'FreeBSD' (9)" + .endif