git: 9aaa7b5157c9 - main - Uses/electronfix.mk: Add an additional stage-qa step to find non-native Node modules.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 14 Nov 2023 18:37:27 UTC
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=9aaa7b5157c9c9402ff43b8f4b68fa2cd2a7f412 commit 9aaa7b5157c9c9402ff43b8f4b68fa2cd2a7f412 Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2023-11-14 18:34:37 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> 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