Thu Nov 23 16:57:37 2023 UTC ()
nodejs*: Consolidate and fix python includes.

Ensures that PYTHON_FOR_BUILD_ONLY is set prior to including pyversion.mk,
and ensures python and its dependencies are not buildlinked.


(jperkin)
diff -r1.280 -r1.281 pkgsrc/lang/nodejs/Makefile
diff -r1.54 -r1.55 pkgsrc/lang/nodejs/Makefile.common
diff -r1.22 -r1.23 pkgsrc/lang/nodejs16/Makefile
diff -r1.24 -r1.25 pkgsrc/lang/nodejs18/Makefile
diff -r1.2 -r1.3 pkgsrc/lang/nodejs20/Makefile
Fri Nov 24 01:57:37 2023
Tue Jul 11 15:13:10 2023
pkgsrc/lang/nodejs16/Makefile,v
anoncvs not yet been updated
cvs diff -r1.280 -r1.281 pkgsrc/lang/nodejs/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/nodejs/Makefile 2023/11/15 18:13:05 1.280
+++ pkgsrc/lang/nodejs/Makefile 2023/11/23 16:57:37 1.281
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.280 2023/11/15 18:13:05 adam Exp $ 1# $NetBSD: Makefile,v 1.281 2023/11/23 16:57:37 jperkin Exp $
2 2
3DISTNAME= node-v21.2.0 3DISTNAME= node-v21.2.0
4EXTRACT_SUFX= .tar.xz 4EXTRACT_SUFX= .tar.xz
5 5
6USE_LANGUAGES= c gnu++17 6USE_LANGUAGES= c gnu++17
7 7
8USE_CXX_FEATURES+= c++17 charconv 8USE_CXX_FEATURES+= c++17 charconv
9 9
10.include "../../mk/bsd.prefs.mk" 10.include "../../mk/bsd.prefs.mk"
11 11
12# XXX: figure out a way to add rpaths to torque 12# XXX: figure out a way to add rpaths to torque
13MAKE_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib 13MAKE_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib
14 14
@@ -33,19 +33,18 @@ post-install: minusx @@ -33,19 +33,18 @@ post-install: minusx
33minusx: 33minusx:
34 ${CHMOD} -x ${DESTDIR}${PREFIX}/lib/node_modules/corepack/shims/*.cmd 34 ${CHMOD} -x ${DESTDIR}${PREFIX}/lib/node_modules/corepack/shims/*.cmd
35 35
36.include "options.mk" 36.include "options.mk"
37 37
38# Node turns on -latomic for arm, mips and ppc. 38# Node turns on -latomic for arm, mips and ppc.
39.if ${MACHINE_ARCH:M*arm*} || \ 39.if ${MACHINE_ARCH:M*arm*} || \
40 ${MACHINE_ARCH:M*powerpc*} || \ 40 ${MACHINE_ARCH:M*powerpc*} || \
41 ${MACHINE_ARCH:M*mips*} 41 ${MACHINE_ARCH:M*mips*}
42.include "../../devel/libatomic/buildlink3.mk" 42.include "../../devel/libatomic/buildlink3.mk"
43.endif 43.endif
44 44
45.include "../../lang/nodejs/Makefile.common" 45.include "../../lang/nodejs/Makefile.common"
 46
46.include "../../net/ngtcp2/buildlink3.mk" 47.include "../../net/ngtcp2/buildlink3.mk"
47.include "../../www/nghttp3/buildlink3.mk" 48.include "../../www/nghttp3/buildlink3.mk"
48.include "../../lang/python/batteries-included.mk" 
49.include "../../lang/python/tool.mk" 
50.include "../../mk/atomic64.mk" 49.include "../../mk/atomic64.mk"
51.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"
cvs diff -r1.54 -r1.55 pkgsrc/lang/nodejs/Makefile.common (expand / switch to unified diff)

--- pkgsrc/lang/nodejs/Makefile.common 2023/11/22 16:30:23 1.54
+++ pkgsrc/lang/nodejs/Makefile.common 2023/11/23 16:57:37 1.55
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.54 2023/11/22 16:30:23 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.55 2023/11/23 16:57:37 jperkin Exp $
2# used by lang/nodejs/Makefile 2# used by lang/nodejs/Makefile
3# used by lang/nodejs14/Makefile 3# used by lang/nodejs14/Makefile
4# used by lang/nodejs16/Makefile 4# used by lang/nodejs16/Makefile
5# used by lang/nodejs18/Makefile 5# used by lang/nodejs18/Makefile
6# used by lang/nodejs20/Makefile 6# used by lang/nodejs20/Makefile
7 7
8CATEGORIES= lang 8CATEGORIES= lang
9MASTER_SITES= https://nodejs.org/dist/${DISTNAME:S/node-//}/ 9MASTER_SITES= https://nodejs.org/dist/${DISTNAME:S/node-//}/
10PKGNAME= ${DISTNAME:S/-v/js-/} 10PKGNAME= ${DISTNAME:S/-v/js-/}
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= https://nodejs.org/ 13HOMEPAGE= https://nodejs.org/
14COMMENT= V8 JavaScript for clients and servers 14COMMENT= V8 JavaScript for clients and servers
@@ -91,20 +91,21 @@ paxctl: @@ -91,20 +91,21 @@ paxctl:
91.if defined(TOOLS_PLATFORM.paxctl) 91.if defined(TOOLS_PLATFORM.paxctl)
92 ${TOOLS_PLATFORM.paxctl} +m ${DESTDIR}${PREFIX}/bin/node 92 ${TOOLS_PLATFORM.paxctl} +m ${DESTDIR}${PREFIX}/bin/node
93.endif 93.endif
94 94
95.if ${OPSYS} != "Darwin" 95.if ${OPSYS} != "Darwin"
96.include "../../devel/libexecinfo/buildlink3.mk" 96.include "../../devel/libexecinfo/buildlink3.mk"
97.endif 97.endif
98.include "../../archivers/brotli/buildlink3.mk" 98.include "../../archivers/brotli/buildlink3.mk"
99BUILDLINK_API_DEPENDS.libuv+= libuv>=1.41 99BUILDLINK_API_DEPENDS.libuv+= libuv>=1.41
100.include "../../devel/libuv/buildlink3.mk" 100.include "../../devel/libuv/buildlink3.mk"
101.include "../../devel/zlib/buildlink3.mk" 101.include "../../devel/zlib/buildlink3.mk"
102.include "../../lang/nodejs/application.mk" 102.include "../../lang/nodejs/application.mk"
103.include "../../lang/python/application.mk" 103.include "../../lang/python/application.mk"
 104.include "../../lang/python/batteries-included.mk"
104.include "../../lang/python/tool.mk" 105.include "../../lang/python/tool.mk"
105.include "../../net/libcares/buildlink3.mk" 106.include "../../net/libcares/buildlink3.mk"
106.include "../../textproc/icu/buildlink3.mk" 107.include "../../textproc/icu/buildlink3.mk"
107# Requires nghttp2_option_set_max_settings 108# Requires nghttp2_option_set_max_settings
108BUILDLINK_API_DEPENDS.nghttp2+= nghttp2>=1.41.0 109BUILDLINK_API_DEPENDS.nghttp2+= nghttp2>=1.41.0
109.include "../../www/nghttp2/buildlink3.mk" 110.include "../../www/nghttp2/buildlink3.mk"
110.include "../../mk/pthread.buildlink3.mk" 111.include "../../mk/pthread.buildlink3.mk"
cvs diff -r1.22 -r1.23 pkgsrc/lang/nodejs16/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/nodejs16/Makefile 1.22
+++ pkgsrc/lang/nodejs16/Makefile 1.23
cvs diff -r1.24 -r1.25 pkgsrc/lang/nodejs18/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/nodejs18/Makefile 2023/11/08 13:19:50 1.24
+++ pkgsrc/lang/nodejs18/Makefile 2023/11/23 16:57:37 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.24 2023/11/08 13:19:50 wiz Exp $ 1# $NetBSD: Makefile,v 1.25 2023/11/23 16:57:37 jperkin Exp $
2 2
3DISTNAME= node-v18.18.2 3DISTNAME= node-v18.18.2
4PKGREVISION= 3 4PKGREVISION= 3
5EXTRACT_SUFX= .tar.xz 5EXTRACT_SUFX= .tar.xz
6 6
7USE_LANGUAGES= c gnu++17 7USE_LANGUAGES= c gnu++17
8 8
9USE_CXX_FEATURES+= c++17 charconv 9USE_CXX_FEATURES+= c++17 charconv
10 10
11.include "../../mk/bsd.prefs.mk" 11.include "../../mk/bsd.prefs.mk"
12 12
13# XXX: figure out a way to add rpaths to torque 13# XXX: figure out a way to add rpaths to torque
14MAKE_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib 14MAKE_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib
@@ -34,20 +34,19 @@ CXXFLAGS+= -mstackrealign @@ -34,20 +34,19 @@ CXXFLAGS+= -mstackrealign
34post-install: minusx 34post-install: minusx
35minusx: 35minusx:
36 ${CHMOD} -x ${DESTDIR}${PREFIX}/lib/node_modules/corepack/shims/*.cmd 36 ${CHMOD} -x ${DESTDIR}${PREFIX}/lib/node_modules/corepack/shims/*.cmd
37 37
38.include "../../lang/nodejs/options.mk" 38.include "../../lang/nodejs/options.mk"
39 39
40# Node turns on -latomic for arm, mips and ppc. 40# Node turns on -latomic for arm, mips and ppc.
41.if ${MACHINE_ARCH:M*arm*} || \ 41.if ${MACHINE_ARCH:M*arm*} || \
42 ${MACHINE_ARCH:M*powerpc*} || \ 42 ${MACHINE_ARCH:M*powerpc*} || \
43 ${MACHINE_ARCH:M*mips*} 43 ${MACHINE_ARCH:M*mips*}
44.include "../../devel/libatomic/buildlink3.mk" 44.include "../../devel/libatomic/buildlink3.mk"
45.endif 45.endif
46 46
47.include "../../lang/python/batteries-included.mk" 
48.include "../../lang/python/tool.mk" 
49.include "../../lang/nodejs/Makefile.common" 47.include "../../lang/nodejs/Makefile.common"
 48
50.include "../../net/ngtcp2/buildlink3.mk" 49.include "../../net/ngtcp2/buildlink3.mk"
51.include "../../www/nghttp3/buildlink3.mk" 50.include "../../www/nghttp3/buildlink3.mk"
52.include "../../mk/atomic64.mk" 51.include "../../mk/atomic64.mk"
53.include "../../mk/bsd.pkg.mk" 52.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/lang/nodejs20/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/nodejs20/Makefile 2023/11/08 13:19:50 1.2
+++ pkgsrc/lang/nodejs20/Makefile 2023/11/23 16:57:37 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2023/11/08 13:19:50 wiz Exp $ 1# $NetBSD: Makefile,v 1.3 2023/11/23 16:57:37 jperkin Exp $
2 2
3DISTNAME= node-v20.9.0 3DISTNAME= node-v20.9.0
4EXTRACT_SUFX= .tar.xz 4EXTRACT_SUFX= .tar.xz
5 5
6USE_LANGUAGES= c gnu++17 6USE_LANGUAGES= c gnu++17
7 7
8USE_CXX_FEATURES+= c++17 charconv 8USE_CXX_FEATURES+= c++17 charconv
9 9
10PKGREVISION= 1 10PKGREVISION= 1
11.include "../../mk/bsd.prefs.mk" 11.include "../../mk/bsd.prefs.mk"
12 12
13# XXX: figure out a way to add rpaths to torque 13# XXX: figure out a way to add rpaths to torque
14MAKE_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib 14MAKE_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib
@@ -34,19 +34,18 @@ post-install: minusx @@ -34,19 +34,18 @@ post-install: minusx
34minusx: 34minusx:
35 ${CHMOD} -x ${DESTDIR}${PREFIX}/lib/node_modules/corepack/shims/*.cmd 35 ${CHMOD} -x ${DESTDIR}${PREFIX}/lib/node_modules/corepack/shims/*.cmd
36 36
37.include "../../lang/nodejs/options.mk" 37.include "../../lang/nodejs/options.mk"
38 38
39# Node turns on -latomic for arm, mips and ppc. 39# Node turns on -latomic for arm, mips and ppc.
40.if ${MACHINE_ARCH:M*arm*} || \ 40.if ${MACHINE_ARCH:M*arm*} || \
41 ${MACHINE_ARCH:M*powerpc*} || \ 41 ${MACHINE_ARCH:M*powerpc*} || \
42 ${MACHINE_ARCH:M*mips*} 42 ${MACHINE_ARCH:M*mips*}
43.include "../../devel/libatomic/buildlink3.mk" 43.include "../../devel/libatomic/buildlink3.mk"
44.endif 44.endif
45 45
46.include "../../lang/nodejs/Makefile.common" 46.include "../../lang/nodejs/Makefile.common"
 47
47.include "../../net/ngtcp2/buildlink3.mk" 48.include "../../net/ngtcp2/buildlink3.mk"
48.include "../../www/nghttp3/buildlink3.mk" 49.include "../../www/nghttp3/buildlink3.mk"
49.include "../../lang/python/batteries-included.mk" 
50.include "../../lang/python/tool.mk" 
51.include "../../mk/atomic64.mk" 50.include "../../mk/atomic64.mk"
52.include "../../mk/bsd.pkg.mk" 51.include "../../mk/bsd.pkg.mk"