Attachment #249024 for bug #268363

Lines 7-16 Link Here

(-)b/Mk/Uses/elfctl.mk (-2 / +15 lines)
7	# Variables	7	# Variables
8	#	8	#
9	# ELF_FEATURES= featurelist:path/to/file1 \	9	# ELF_FEATURES= featurelist:path/to/file1 \
10	# featurelist:path/to/file1 \	10	# featurelist:path/to/file2 \
11	featurelist:path/to/file2	11	# featurelist:path/to/file3
		12	#
		13	# ELF_FEATURES_STAGE= featurelist:path/to/file1 \
		14	# featurelist:path/to/file2 \
		15	# featurelist:path/to/file3
12	#	16	#
13	# The file paths listed in ELF_FEATURES are relative to ${BUILD_WRKSRC}.	17	# The file paths listed in ELF_FEATURES are relative to ${BUILD_WRKSRC}.
		18	# The file paths listed in ELF_FEATURES_STAGE are relative to ${STAGEDIR}.
14	#	19	#
15		20
16	.if !defined(_INCLUDE_USES_ELFCTL_MK)	21	.if !defined(_INCLUDE_USES_ELFCTL_MK)
Lines 24-27 elfctl-post-build: Link Here
24	. endfor	29	. endfor
25	. endif	30	. endif
26		31
		32	. if ! empty(ELF_FEATURES_STAGE)
		33	_USES_stage+= 720:elfctl-post-stage
		34	elfctl-post-stage:
		35	. for feat in ${ELF_FEATURES_STAGE}
		36	${ELFCTL} -i -e ${feat:C/:.//} ${STAGEDIR}/${feat:C/.://}
		37	. endfor
		38	. endif
		39
27	.endif	40	.endif

Lines 28-34 LIB_DEPENDS+= libbrotlidec.so:archivers/brotli \ Link Here

(-)b/www/node16/Makefile (-1 / +4 lines)
28	libnghttp2.so:www/libnghttp2 \	28	libnghttp2.so:www/libnghttp2 \
29	libuv.so:devel/libuv	29	libuv.so:devel/libuv
30		30
31	USES= compiler:c++11-lib gmake localbase pkgconfig python:build \	31	USES= compiler:c++11-lib elfctl gmake localbase pkgconfig python:build \
32	shebangfix	32	shebangfix
33		33
34	BROKEN_SSL= libressl libressl-devel	34	BROKEN_SSL= libressl libressl-devel
Lines 58-63 MAKE_ARGS+= CC.host="${CCACHE_BIN} ${CC}" \ Link Here
58	LINK.host=${CXX} \	58	LINK.host=${CXX} \
59	LDFLAGS.host="${LDFLAGS}"	59	LDFLAGS.host="${LDFLAGS}"
60		60
		61	ELF_FEATURES= +wxneeded:out/Release/node
		62	ELF_FEATURES_STAGE= +wxneeded:usr/local/bin/node
		63
61	CONFLICTS_INSTALL= node[0-9][0-9]	64	CONFLICTS_INSTALL= node[0-9][0-9]
62		65
63	REINPLACE_ARGS= -i ''	66	REINPLACE_ARGS= -i ''




PORTNAME=	node
PORTVERSION=	${NODEJS_PORTVERSION}
DISTVERSIONPREFIX=	v
PORTREVISION=	2
CATEGORIES=	www
MASTER_SITES=	https://nodejs.org/dist/v${PORTVERSION}/
PKGNAMESUFFIX=	18

		libnghttp2.so:www/libnghttp2 \
		libuv.so:devel/libuv

USES=		compiler:c++11-lib elfctl gmake localbase pkgconfig python:build shebangfix tar:xz

CONFIGURE_ARGS=	--prefix=${PREFIX:S|^${DESTDIR}||} \
		--shared-brotli \

		LINK.host="${CXX}"
REINPLACE_ARGS=	-i ''

ELF_FEATURES=	+wxneeded:out/Release/node
ELF_FEATURES_STAGE=	+wxneeded:usr/local/bin/node

CONFLICTS_INSTALL=	node[0-9][0-9]

SHEBANG_FILES=	deps/v8/third_party/inspector_protocol/*.py \

Lines 28-34 LIB_DEPENDS= libbrotlidec.so:archivers/brotli \ Link Here

(-)b/www/node20/Makefile (-1 / +4 lines)
28	libnghttp2.so:www/libnghttp2 \	28	libnghttp2.so:www/libnghttp2 \
29	libuv.so:devel/libuv	29	libuv.so:devel/libuv
30		30
31	USES= compiler:c++11-lib gmake localbase pkgconfig python:build shebangfix tar:xz	31	USES= compiler:c++11-lib elfctl gmake localbase pkgconfig python:build shebangfix tar:xz
32		32
33	CONFIGURE_ARGS= --prefix=${PREFIX:S\|^${DESTDIR}\|\|} \	33	CONFIGURE_ARGS= --prefix=${PREFIX:S\|^${DESTDIR}\|\|} \
34	--shared-brotli \	34	--shared-brotli \
Lines 46-51 MAKE_ENV= CC.host="${CCACHE_BIN} ${CC}" \ Link Here
46	LINK.host="${CXX}"	46	LINK.host="${CXX}"
47	REINPLACE_ARGS= -i ''	47	REINPLACE_ARGS= -i ''
48		48
		49	ELF_FEATURES= +wxneeded:out/Release/node
		50	ELF_FEATURES_STAGE= +wxneeded:usr/local/bin/node
		51
49	CONFLICTS_INSTALL= node[0-9][0-9]	52	CONFLICTS_INSTALL= node[0-9][0-9]
50		53
51	SHEBANG_FILES= deps/v8/third_party/inspector_protocol/*.py \	54	SHEBANG_FILES= deps/v8/third_party/inspector_protocol/*.py \

Lines 28-34 LIB_DEPENDS= libbrotlidec.so:archivers/brotli \ Link Here

(-)b/www/node21/Makefile (-1 / +4 lines)
28	libnghttp2.so:www/libnghttp2 \	28	libnghttp2.so:www/libnghttp2 \
29	libuv.so:devel/libuv	29	libuv.so:devel/libuv
30		30
31	USES= compiler:c++11-lib gmake localbase pkgconfig python:build shebangfix tar:xz	31	USES= compiler:c++11-lib elfctl gmake localbase pkgconfig python:build shebangfix tar:xz
32		32
33	CONFIGURE_ARGS= --prefix=${PREFIX:S\|^${DESTDIR}\|\|} \	33	CONFIGURE_ARGS= --prefix=${PREFIX:S\|^${DESTDIR}\|\|} \
34	--shared-brotli \	34	--shared-brotli \
Lines 46-51 MAKE_ENV= CC.host="${CCACHE_BIN} ${CC}" \ Link Here
46	LINK.host="${CXX}"	46	LINK.host="${CXX}"
47	REINPLACE_ARGS= -i ''	47	REINPLACE_ARGS= -i ''
48		48
		49	ELF_FEATURES= +wxneeded:out/Release/node
		50	ELF_FEATURES_STAGE= +wxneeded:usr/local/bin/node
		51
49	CONFLICTS_INSTALL= node[0-9][0-9]	52	CONFLICTS_INSTALL= node[0-9][0-9]
50		53
51	SHEBANG_FILES= deps/v8/third_party/inspector_protocol/*.py \	54	SHEBANG_FILES= deps/v8/third_party/inspector_protocol/*.py \

Return to bug 268363

Lines 1-7 Link Here

(-)b/www/node18/Makefile (-2 / +4 lines)
1	PORTNAME= node	1	PORTNAME= node
2	PORTVERSION= ${NODEJS_PORTVERSION}	2	PORTVERSION= ${NODEJS_PORTVERSION}
3	DISTVERSIONPREFIX= v	3	DISTVERSIONPREFIX= v
4	PORTREVISION= 2
5	CATEGORIES= www	4	CATEGORIES= www
6	MASTER_SITES= https://nodejs.org/dist/v${PORTVERSION}/	5	MASTER_SITES= https://nodejs.org/dist/v${PORTVERSION}/
7	PKGNAMESUFFIX= 18	6	PKGNAMESUFFIX= 18
Lines 28-34 LIB_DEPENDS= libbrotlidec.so:archivers/brotli \ Link Here
28	libnghttp2.so:www/libnghttp2 \	27	libnghttp2.so:www/libnghttp2 \
29	libuv.so:devel/libuv	28	libuv.so:devel/libuv
30		29
31	USES= compiler:c++11-lib gmake localbase pkgconfig python:build shebangfix tar:xz	30	USES= compiler:c++11-lib elfctl gmake localbase pkgconfig python:build shebangfix tar:xz
32		31
33	CONFIGURE_ARGS= --prefix=${PREFIX:S\|^${DESTDIR}\|\|} \	32	CONFIGURE_ARGS= --prefix=${PREFIX:S\|^${DESTDIR}\|\|} \
34	--shared-brotli \	33	--shared-brotli \
Lines 46-51 MAKE_ENV= CC.host="${CCACHE_BIN} ${CC}" \ Link Here
46	LINK.host="${CXX}"	45	LINK.host="${CXX}"
47	REINPLACE_ARGS= -i ''	46	REINPLACE_ARGS= -i ''
48		47
		48	ELF_FEATURES= +wxneeded:out/Release/node
		49	ELF_FEATURES_STAGE= +wxneeded:usr/local/bin/node
		50
49	CONFLICTS_INSTALL= node[0-9][0-9]	51	CONFLICTS_INSTALL= node[0-9][0-9]
50		52
51	SHEBANG_FILES= deps/v8/third_party/inspector_protocol/*.py \	53	SHEBANG_FILES= deps/v8/third_party/inspector_protocol/*.py \