From: "Björn Esser" <b.esser@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: "Björn Esser" <b.esser@pengutronix.de>
Subject: [ptxdist] [PATCH v2 1/3] nodejs: version bump 6.9.5 -> 12.14.1 LTS
Date: Mon, 13 Jan 2020 11:18:08 +0100 [thread overview]
Message-ID: <20200113101809.3260-1-b.esser@pengutronix.de> (raw)
We also need to build a host-nodejs package first, as there
are some tools needed to be executable on the host system
during the intermediate cross-build process.
This package drops support for NPM, as we will be managing
Node.js packages with Yarn, which will be implemented in the
following commits.
The patches that are shipped along with this version of the
package have been taken from the SRPM of the Node.js-package
in Fedora. See:
https://src.fedoraproject.org/rpms/nodejs/c/f0e2a1ed4615?branch=master
Signed-off-by: Björn Esser <b.esser@pengutronix.de>
---
v2: fix configure flags for host-nodejs
rules/host-nodejs.in | 2 +
rules/host-nodejs.make | 41 +++++++-------
rules/nodejs.in | 54 +++++-------------
rules/nodejs.make | 121 ++++++++++++++---------------------------
4 files changed, 76 insertions(+), 142 deletions(-)
diff --git a/rules/host-nodejs.in b/rules/host-nodejs.in
index 6ea0dd519..527e7d427 100644
--- a/rules/host-nodejs.in
+++ b/rules/host-nodejs.in
@@ -3,4 +3,6 @@
config HOST_NODEJS
tristate
default y if ALLYES
+ select HOST_C_ARES
select HOST_OPENSSL
+ select HOST_ZLIB
diff --git a/rules/host-nodejs.make b/rules/host-nodejs.make
index 432cf930c..e26812c25 100644
--- a/rules/host-nodejs.make
+++ b/rules/host-nodejs.make
@@ -1,6 +1,9 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Grzeschik <mgr@pengutronix.de>
+# Copyright (C) 2019 by Björn Esser <bes@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
#
# For further information about the PTXdist project and license conditions
# see the README file.
@@ -11,32 +14,27 @@
#
HOST_PACKAGES-$(PTXCONF_HOST_NODEJS) += host-nodejs
-#
-# Paths and names
-#
-HOST_NODEJS_NPMBOX_VERSION := 2.6.1
-HOST_NODEJS_NPMBOX_MD5 := 2779b99e3427cd49bbf28a236d871028
-HOST_NODEJS_NPMBOX := npmbox-$(HOST_NODEJS_NPMBOX_VERSION)
-HOST_NODEJS_NPMBOX_SUFFIX := tar.bz2
-HOST_NODEJS_NPMBOX_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(HOST_NODEJS_NPMBOX).$(HOST_NODEJS_NPMBOX_SUFFIX)
-HOST_NODEJS_NPMBOX_SOURCE := $(SRCDIR)/$(HOST_NODEJS_NPMBOX).$(HOST_NODEJS_NPMBOX_SUFFIX)
-$(HOST_NODEJS_NPMBOX_SOURCE) := HOST_NODEJS_NPMBOX
-HOST_NODEJS_NPMBOX_DIR = $(HOST_NODEJS_PKGDIR)
-HOST_NODEJS_NPMBOX_STRIP_LEVEL := 0
-
-HOST_NODEJS_SOURCES += $(HOST_NODEJS_NPMBOX_SOURCE)
+# Always run the preprocessor locally.
+HOST_NODEJS_COMPILE_ENV := \
+ ICECC_REMOTE_CPP=0
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
-HOST_NODEJS_CONF_TOOL := autoconf
-HOST_NODEJS_CONF_OPT := \
+HOST_NODEJS_CONF_TOOL := autoconf
+HOST_NODEJS_CONF_OPT := \
$(HOST_AUTOCONF) \
--prefix=/ \
+ --no-cross-compiling \
--dest-os=linux \
+ --without-dtrace \
+ --without-etw \
+ --without-npm \
+ --shared \
--shared-openssl \
--shared-zlib \
+ --shared-cares \
--with-intl=none \
--without-snapshot
@@ -47,10 +45,13 @@ HOST_NODEJS_CONF_OPT := \
$(STATEDIR)/host-nodejs.install:
@$(call targetinfo)
@$(call install, HOST_NODEJS)
- @sed "1s^.*^#\!/usr/bin/env node^g" \
- -i $(HOST_NODEJS_PKGDIR)/lib/node_modules/npm/bin/npm-cli.js
- @$(call extract, HOST_NODEJS_NPMBOX)
- @$(call world/patchin, HOST_NODEJS_NPMBOX)
+
+# # Needed to cross-compile for target.
+ @install -pm 0755 $(HOST_NODEJS_DIR)/out/Release/bytecode_builtins_list_generator $(HOST_NODEJS_PKGDIR)/bin/
+ @install -pm 0755 $(HOST_NODEJS_DIR)/out/Release/mkcodecache $(HOST_NODEJS_PKGDIR)/bin/
+ @install -pm 0755 $(HOST_NODEJS_DIR)/out/Release/node_mksnapshot $(HOST_NODEJS_PKGDIR)/bin/
+ @install -pm 0755 $(HOST_NODEJS_DIR)/out/Release/torque $(HOST_NODEJS_PKGDIR)/bin/
+
@$(call touch)
# vim: syntax=make
diff --git a/rules/nodejs.in b/rules/nodejs.in
index e4ac11568..6d23f94ef 100644
--- a/rules/nodejs.in
+++ b/rules/nodejs.in
@@ -1,48 +1,20 @@
-## SECTION=staging
-## old section:
-### SECTION=bytecode_engines
+## SECTION=bytecode_engines
menuconfig NODEJS
tristate
- prompt "nodejs "
+ prompt "Node.js "
select HOST_NODEJS
+ select C_ARES
+ select LIBUV
select OPENSSL
select ZLIB
help
- evented I/O for V8 javascript
-
- Node.js is a platform built on Chrome's JavaScript runtime
- for easily building fast, scalable network
- applications. Node.js uses an event-driven, non-blocking I/O
- model that makes it lightweight and efficient, perfect for
- data-intensive real-time applications that run across
- distributed devices.
-
- STAGING: remove in ptxdist-2020.06.0
- Old version that need to be updated. Fails to build with gcc >= 7.x.
-
-
-if NODEJS
-
-config NODEJS_NPM
- bool
- prompt "install npm on target"
-
-config NODEJS_MODULE_LIST
- string
- prompt "install nodejs packages"
- help
- A list of Node.js packages including version (e.g. express@4.13.0).
- 'ptxdist make nodejs-get' will download the packages and create a
- npmbox file for each package. Note: The packages are stored in
- local_src/ and should be part of the BSP. Downloading a package
- again may result in different content.
-
-config NODEJS_MODULE_MD5
- string
- prompt "nodejs packages md5 sums"
- help
- A md5 sum for each npmbox file of the packages listed in
- NODEJS_MODULE_LIST.
-
-endif
+ Node.js is an open-source, cross-platform, JavaScript runtime
+ environment that executes JavaScript code outside of a browser.
+ Node.js lets developers use JavaScript to write command line
+ tools and for server-side scripting—running scripts server-side
+ to produce dynamic web page content before the page is sent to
+ the user's web browser. Consequently, Node.js represents a
+ "JavaScript everywhere" paradigm, unifying web-application
+ development around a single programming language, rather than
+ different languages for server- and client-side scripts.
diff --git a/rules/nodejs.make b/rules/nodejs.make
index 03098b180..63f8299f0 100644
--- a/rules/nodejs.make
+++ b/rules/nodejs.make
@@ -1,6 +1,9 @@
# -*-makefile-*-
#
# Copyright (C) 2015 by Michael Grzeschik <mgr@pengutronix.de>
+# Copyright (C) 2019 by Björn Esser <bes@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
#
# For further information about the PTXdist project and license conditions
# see the README file.
@@ -16,19 +19,24 @@ endif
#
# Paths and names
#
-NODEJS_VERSION := v6.9.5
-NODEJS_MD5 := a2a820b797fb69ffb259b479c7f5df32
-NODEJS := node-$(NODEJS_VERSION)
-NODEJS_SUFFIX := tar.gz
-NODEJS_URL := http://nodejs.org/dist/$(NODEJS_VERSION)/$(NODEJS).$(NODEJS_SUFFIX)
-NODEJS_SOURCE := $(SRCDIR)/$(NODEJS).$(NODEJS_SUFFIX)
-NODEJS_DIR := $(BUILDDIR)/$(NODEJS)
-NODEJS_LICENSE := unknown
-
-NODEJS_SRCDIR := $(PTXDIST_WORKSPACE)/local_src
-NODEJS_MODULE_LIST := $(call remove_quotes, $(PTXCONF_NODEJS_MODULE_LIST))
-NODEJS_NPMBOXES := $(foreach module,$(NODEJS_MODULE_LIST), \
- $(addprefix $(NODEJS_SRCDIR)/,$(addsuffix .npmbox,$(module))))
+NODEJS_VERSION := v12.14.1
+NODEJS_MD5 := 1c78a75f5c95321f533ecccca695e814
+NODEJS := node-$(NODEJS_VERSION)
+NODEJS_SUFFIX := tar.xz
+NODEJS_URL := http://nodejs.org/dist/$(NODEJS_VERSION)/$(NODEJS).$(NODEJS_SUFFIX)
+NODEJS_SOURCE := $(SRCDIR)/$(NODEJS).$(NODEJS_SUFFIX)
+NODEJS_DIR := $(BUILDDIR)/$(NODEJS)
+NODEJS_LICENSE := MIT
+NODEJS_LICENSE_FILES := \
+ file://LICENSE;md5=be4d5107c64dc3d7c57e3797e1a0674b
+
+NODEJS_HOST_TOOLS := \
+ bytecode_builtins_list_generator \
+ gen-regexp-special-case \
+ mkcodecache \
+ mksnapshot \
+ node_mksnapshot \
+ torque
node/env = \
$(CROSS_ENV) \
@@ -39,47 +47,6 @@ node/env = \
npm_config_nodedir=$(NODEJS_DIR) \
$(1)
-# remove version number from package string
-define rmversion
-$(shell echo $(1) | sed 's-\<\([^ @]*\)@[^ @]*\>-\1-g')
-endef
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-nodejs-get: $(NODEJS_NPMBOXES)
-PHONY += nodejs-get
-
-$(NODEJS_SRCDIR)/%.npmbox:| $(STATEDIR)/host-nodejs.install.post
- @$(call targetinfo)
- mkdir -p $(NODEJS_SRCDIR)
- cd $(NODEJS_SRCDIR) && \
- $(call node/env, npmbox $(*) --verbose)
-
-# Map package sources and md5sums for world/check_src
-NODEJS_MODULE_MD5 := $(call remove_quotes, $(PTXCONF_NODEJS_MODULE_MD5))
-define def_mod
-$(call rmversion,$(1))_SOURCE := $(addprefix $(NODEJS_SRCDIR)/,$(addsuffix .npmbox,$(1)))
-$(call rmversion,$(1))_MD5 := $(firstword $(NODEJS_MODULE_MD5))
-NODEJS_MODULE_MD5 := $(filter-out $(firstword $(NODEJS_MODULE_MD5)),$(NODEJS_MODULE_MD5))
-endef
-$(foreach module,$(NODEJS_MODULE_LIST),$(eval $(call def_mod,$(module))))
-
-$(STATEDIR)/nodejs.get:
- @$(call targetinfo)
- @$(call world/get, NODEJS)
- @$(call world/check_src, NODEJS)
- @$(foreach npmbox,$(NODEJS_NPMBOXES), \
- if [ ! -e $(npmbox) ]; then \
- echo "NodeJS modules must be downloaded with 'ptxdist make nodejs-get'"; \
- echo ; \
- exit 1; \
- fi;)
- @$(foreach module,$(NODEJS_MODULE_LIST), \
- $(call world/check_src, $(call rmversion,$(module)))$(ptx/nl))
- @$(call touch)
-
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
@@ -99,33 +66,37 @@ NODEJS_ARM_FLOAT_ABI = $(shell ptxd_cross_cc_v | sed -n "s/COLLECT_GCC_OPTIONS=.
NODEJS_ARM_FPU = $(shell ptxd_cross_cc_v | sed -n "s/COLLECT_GCC_OPTIONS=.*'-mfpu=\([^']*\)'.*/\1/p" | tail -n1)
endif
-NODEJS_CONF_TOOL := autoconf
-# Use '=' to delay $(shell ...) calls until this is needed
-NODEJS_CONF_OPT = \
+NODEJS_CONF_OPT := \
--prefix=/usr \
--dest-cpu=$(NODEJS_ARCH) \
+ --no-cross-compiling \
--dest-os=linux \
$(call ptx/ifdef,PTXCONF_ARCH_ARM,--with-arm-float-abi=$(NODEJS_ARM_FLOAT_ABI)) \
$(call ptx/ifdef,PTXCONF_ARCH_ARM,--with-arm-fpu=$(NODEJS_ARM_FPU)) \
--without-dtrace \
- $(call ptx/ifdef,PTXCONF_NODEJS_NPM,,--without-npm) \
+ --without-etw \
+ --without-npm \
+ --shared \
+ --shared-libuv \
--shared-openssl \
--shared-zlib \
+ --shared-cares \
--with-intl=none \
--without-snapshot
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/nodejs.install:
+$(STATEDIR)/nodejs.prepare:
@$(call targetinfo)
- @$(call install, NODEJS)
- @$(foreach npmbox, $(NODEJS_NPMBOXES), \
- cd $(NODEJS_PKGDIR)/usr/lib/ && \
- $(call node/env, npmunbox -build-from-source $(npmbox))$(ptx/nl))
- @$(call touch)
+# # Using a patch here isn't enough, as we need absolute paths
+# # to the pre-built host tool binaries, which are different for
+# # each individual checkout of a BSP. -_-
+ $(foreach f,$(NODEJS_HOST_TOOLS), \
+ $(shell sed -i -e "s#<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)$(f)<(EXECUTABLE_SUFFIX)#$(PTXDIST_SYSROOT_HOST)/bin/$(f)#" $(NODEJS_DIR)/node.gyp $(NODEJS_DIR)/tools/v8_gypfiles/v8.gyp) \
+ )
+
+ @$(call world/prepare, NODEJS)
+
+ @$(call touch)
# ----------------------------------------------------------------------------
# Target-Install
@@ -141,23 +112,11 @@ $(STATEDIR)/nodejs.targetinstall:
@$(call install_fixup, nodejs,DESCRIPTION,missing)
@$(call install_copy, nodejs, 0, 0, 0755, -, /usr/bin/node)
+ @$(call install_lib, nodejs, 0, 0, 0644, libnode)
# # the place node searches for packages
@$(call install_link, nodejs, node_modules, /usr/lib/node)
-ifdef PTXCONF_NODEJS_NPM
- @$(call install_link, nodejs, ../lib/node_modules/npm/bin/npm-cli.js, /usr/bin/npm)
- @$(call install_tree, nodejs, 0, 0, -, /usr/lib/node_modules/npm/lib/)
- @$(call install_tree, nodejs, 0, 0, -, /usr/lib/node_modules/npm/bin)
- @$(call install_tree, nodejs, 0, 0, -, /usr/lib/node_modules/npm/scripts)
- @$(call install_tree, nodejs, 0, 0, -, /usr/lib/node_modules/npm/node_modules)
- @$(call install_copy, nodejs, 0, 0, 0644, -, /usr/lib/node_modules/npm/package.json)
-endif
-
-ifneq ($(NODEJS_MODULE_LIST),)
- @$(foreach module, $(call rmversion, $(NODEJS_MODULE_LIST)), \
- $(call install_tree, nodejs, 0, 0, -, /usr/lib/node_modules/$(module))$(ptx/nl))
-endif
@$(call install_finish, nodejs)
@$(call touch)
--
2.25.0.rc1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next reply other threads:[~2020-01-13 10:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-13 10:18 Björn Esser [this message]
2020-01-13 10:18 ` [ptxdist] [PATCH v2 2/3] host-yarn: New package Björn Esser
2020-01-13 10:18 ` [ptxdist] [PATCH v2 3/3] nodejs_packages: " Björn Esser
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200113101809.3260-1-b.esser@pengutronix.de \
--to=b.esser@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox