From patchwork Wed Oct 16 16:41:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1178032 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Z2zeOUaJ"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46tdNm5j6nz9sP7 for ; Thu, 17 Oct 2019 03:41:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D7DB92338F; Wed, 16 Oct 2019 16:41:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bnThE1ekvPZc; Wed, 16 Oct 2019 16:41:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 5EEB1203AB; Wed, 16 Oct 2019 16:41:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D1EE81BF30E for ; Wed, 16 Oct 2019 16:41:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CDCCE87886 for ; Wed, 16 Oct 2019 16:41:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gBO7HyXG-WpT for ; Wed, 16 Oct 2019 16:41:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1EB9087871 for ; Wed, 16 Oct 2019 16:41:37 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id n197so54591115iod.9 for ; Wed, 16 Oct 2019 09:41:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=YFlKIQPq+LWEM0Pcle2aor2/7J5N1+XLRQ5nQfHzsak=; b=Z2zeOUaJckRz+yr+nghIXTZyW7J/VToJOfNPZnihrxvaHqFExYe81buzIdXbKuK/uI JiwaP/agrhu6ec7sYFmeaQsog+YCEUFZEQZCJ3Y0zVy+K5ZryYixq8T6k+ZjAyzws6h2 EStwoDgB71ZH196K4diNxv5kaz4gnZRtOP5uTBkqwIdUaXZyBbJaMmtgLsdtVDzRbSos geC4EHmwmADUsimVip84Wv3MjOpX3QC0KUt/712REs4J8Kn0vE9UdjWVGG2u+MW/8UNK 6w09XLCZP0e577zd+hhmkn6/guvjJ/DC66uJhWRRVDEnGIneMH25SUYkK/hbM14KdbN5 TLiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=YFlKIQPq+LWEM0Pcle2aor2/7J5N1+XLRQ5nQfHzsak=; b=FzhV8RIfYN83v645Y6GSDbNT8hbdOG40BJvyc2AfzBUVACd5ZhXzuCN4ioBmkU0d2y RgspN/YQh9++vEN4HWfEkqMUk0dqzbgMY8JGLe2xfqjJUmIfB90sDtNxWDVoNTytJloS DHW2SNTAlKjcwP0WfhSCEyiR7JhyYX9F7OLdbBSLkdOE6YVx1yySDOGc6ElJY3jGE/JX DNsGPFm1xKkGtc6xASE+eVEVPahJv0GQAzdUr1hYrmWbTARtXah2GZ8V7Ni0s3HkV8rZ 3lD16fOe6keqw3unxfwvHfMIpl/73rP6u/NsexTYkIN7YWNONqb/E/l8oBaa7eOF8jjf 28iQ== X-Gm-Message-State: APjAAAVrHVCqemwledGf2ogjFURgS7XgBlAK7LEDcIHyqCrT2YZkP7Su EfHNz14vy5TfvqrSMKdLW4Nppkqd82c= X-Google-Smtp-Source: APXvYqxGPUy7VOQFeyZdqblOEpHdrv3mF6BLP7qZocT+7F/C5triUDnSQOFuEGp4N25aJn9Uu2DF0A== X-Received: by 2002:a5d:89c4:: with SMTP id a4mr10118790iot.17.1571244095849; Wed, 16 Oct 2019 09:41:35 -0700 (PDT) Received: from james-x399.localdomain (71-218-230-115.hlrn.qwest.net. [71.218.230.115]) by smtp.gmail.com with ESMTPSA id r5sm3742261ill.12.2019.10.16.09.41.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2019 09:41:34 -0700 (PDT) From: James Hilliard To: buildroot@buildroot.org Date: Wed, 16 Oct 2019 10:41:29 -0600 Message-Id: <20191016164129.58902-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 1/1] package/nodejs: bump version to 12.12.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: James Hilliard , Martin Bark , Daniel Price Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Removed libhttpparser dependency as nodejs now uses built in llhttp. Installed additional build tools to host that are required for target build. License file change is due to 3rd party dependency changes and date updates. Dependencies still appear to have Apache and BSD family licenses. Signed-off-by: James Hilliard --- Changes v1 -> v2: - remove libhttpparser from config - refactor host tool installation --- package/nodejs/Config.in | 1 - package/nodejs/nodejs.hash | 6 +++--- package/nodejs/nodejs.mk | 35 ++++++++++++++++++++++++++--------- 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in index ad31f7ec27..ba3fde887d 100644 --- a/package/nodejs/Config.in +++ b/package/nodejs/Config.in @@ -27,7 +27,6 @@ config BR2_PACKAGE_NODEJS # linking, but that's too much of a corner case to support it. depends on !BR2_STATIC_LIBS select BR2_PACKAGE_C_ARES - select BR2_PACKAGE_LIBHTTPPARSER select BR2_PACKAGE_LIBUV select BR2_PACKAGE_ZLIB select BR2_PACKAGE_NGHTTP2 diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index c7de1e637c..a773bb293c 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v10.16.3/SHASUMS256.txt -sha256 7bf1123d7415964775b8f81fe6ec6dd5c3c08abb42bb71dfe4409dbeeba26bbd node-v10.16.3.tar.xz +# From https://nodejs.org/dist/v12.12.0/SHASUMS256.txt +sha256 d9fa875aba9764f1b919115ce1d5e828b02c2a55a6e9e1b6fc771bb6b24a8cc1 node-v12.12.0.tar.xz # Hash for license file -sha256 2b0fe00a83916d0290c8531db25a827e18d01e7c4bf000e9a0f2e826604ba41e LICENSE +sha256 950bbc741dc021489c47683e34e7637e9b96fb4a1f430b2f77a744130516e293 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 5a143845d1..e7f6f8ee8e 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,11 +4,11 @@ # ################################################################################ -NODEJS_VERSION = 10.16.3 +NODEJS_VERSION = 12.12.0 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ - libhttpparser libuv zlib nghttp2 \ + libuv zlib nghttp2 \ $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS)) HOST_NODEJS_DEPENDENCIES = host-libopenssl host-python host-zlib host-patchelf NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components) @@ -18,11 +18,11 @@ NODEJS_CONF_OPTS = \ --without-snapshot \ --shared-zlib \ --shared-cares \ - --shared-http-parser \ --shared-libuv \ --shared-nghttp2 \ --without-dtrace \ --without-etw \ + --cross-compiling \ --dest-os=linux ifeq ($(BR2_PACKAGE_OPENSSL),y) @@ -64,10 +64,18 @@ define HOST_NODEJS_CONFIGURE_CMDS --shared-openssl-includes=$(HOST_DIR)/include/openssl \ --shared-openssl-libpath=$(HOST_DIR)/lib \ --shared-zlib \ - --with-intl=none \ + --no-cross-compiling \ + --with-intl=small-icu \ ) endef +NODEJS_HOST_TOOLS_V8 = \ + torque \ + gen-regexp-special-case \ + bytecode_builtins_list_generator +NODEJS_HOST_TOOLS_NODE = mkcodecache +NODEJS_HOST_TOOLS = $(NODEJS_HOST_TOOLS_V8) $(NODEJS_HOST_TOOLS_NODE) + define HOST_NODEJS_BUILD_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \ $(MAKE) -C $(@D) \ @@ -75,7 +83,9 @@ define HOST_NODEJS_BUILD_CMDS NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH) - $(HOST_DIR)/bin/patchelf --set-rpath $(HOST_DIR)/lib $(@D)/out/Release/torque + $(foreach f,$(NODEJS_HOST_TOOLS), \ + $(HOST_DIR)/bin/patchelf --set-rpath $(HOST_DIR)/lib $(@D)/out/Release/$(f)$(sep) + ) endef define HOST_NODEJS_INSTALL_CMDS @@ -85,7 +95,9 @@ define HOST_NODEJS_INSTALL_CMDS NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH) - $(INSTALL) -m755 -D $(@D)/out/Release/torque $(HOST_DIR)/bin/torque + $(foreach f,$(NODEJS_HOST_TOOLS), \ + $(INSTALL) -m755 -D $(@D)/out/Release/$(f) $(HOST_DIR)/bin/$(f)$(sep) + ) endef ifeq ($(BR2_i386),y) @@ -141,9 +153,14 @@ define NODEJS_CONFIGURE_CMDS $(NODEJS_CONF_OPTS) \ ) - # use host version of torque - sed "s#<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)#$(HOST_DIR)/bin/torque#" \ - -i $(@D)/deps/v8/gypfiles/v8.gyp + $(foreach f,$(NODEJS_HOST_TOOLS_V8), \ + $(SED) "s#<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)$(f)<(EXECUTABLE_SUFFIX)#$(HOST_DIR)/bin/$(f)#" \ + $(@D)/tools/v8_gypfiles/v8.gyp$(sep) + ) + $(foreach f,$(NODEJS_HOST_TOOLS_NODE), \ + $(SED) "s#<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)$(f)<(EXECUTABLE_SUFFIX)#$(HOST_DIR)/bin/$(f)#" \ + -i $(@D)/node.gyp$(sep) + ) endef define NODEJS_BUILD_CMDS