From patchwork Sat Jun 27 02:01:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Bark X-Patchwork-Id: 489006 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id EF68514031E for ; Sat, 27 Jun 2015 12:02:06 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id EE65288DBD; Sat, 27 Jun 2015 02:02:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6KOmQ9WBsSPh; Sat, 27 Jun 2015 02:02:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 2DA7B89997; Sat, 27 Jun 2015 02:02:03 +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 813151C2012 for ; Sat, 27 Jun 2015 02:01:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7D27B8B7A1 for ; Sat, 27 Jun 2015 02:01:53 +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 HJ2jZxzKQnT0 for ; Sat, 27 Jun 2015 02:01:52 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f44.google.com (mail-wg0-f44.google.com [74.125.82.44]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8716F8B694 for ; Sat, 27 Jun 2015 02:01:52 +0000 (UTC) Received: by wgqq4 with SMTP id q4so100979972wgq.1 for ; Fri, 26 Jun 2015 19:01:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=0ZwRZ+PuFH9gHHNtehMr50N/wZgoKytTKGV29si9AC4=; b=Xq5igOPr7aY+MKo9gt+gAXB6yuwmNWbLKZlR/tr1sLCD19SpgmoKv4CcidA2HaP4fh 2q7fKHtOTCI4dBN5+KF9iLSHc/Zu1jtYzhDyfsfLvQQ/UvesB4EaA5kLl7KtbWClWzJW XdX8cjB+g48WdPFdM2XmXBeZMlYJvFsgQPffyLZ3uNvcp+fO+xI9gdFM5zWRKplA/1nm WkU1a5SaK/YOiMKi9H9iT9QRTE0Mv7/xVWj+VpnvqyxkiB3ChOg48X1uKT3RGdmFCjAL n+ZLf3LK17/fl/tcsLZpp5N88/Lk7Rh6hI4ki/2J20PQ8NRaR+dbIy+LAZmPzntr3WkS Se4Q== X-Gm-Message-State: ALoCoQm8EYX6twh+xohvTpPGNv+XxqHYoW0eImcIV0J7H9qlCpD+y/jBsEHO3xT6VdKGumxQU/bZ X-Received: by 10.194.95.167 with SMTP id dl7mr7895707wjb.53.1435370511006; Fri, 26 Jun 2015 19:01:51 -0700 (PDT) Received: from mail.home.barkynet.com (barkynet.plus.com. [80.229.219.126]) by mx.google.com with ESMTPSA id hn7sm52694317wjc.16.2015.06.26.19.01.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Jun 2015 19:01:49 -0700 (PDT) Received: from krusty (krusty.home.barkynet.com [192.168.1.10]) by mail.home.barkynet.com (Postfix) with ESMTP id 5377B1EF77; Sat, 27 Jun 2015 03:01:46 +0100 (BST) Received: by krusty (Postfix, from userid 10000) id 5D3246C0941; Sat, 27 Jun 2015 03:01:43 +0100 (BST) From: Martin Bark To: buildroot@buildroot.org Date: Sat, 27 Jun 2015 03:01:34 +0100 Message-Id: <1435370498-25473-2-git-send-email-martin@barkynet.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1435370498-25473-1-git-send-email-martin@barkynet.com> References: <1435370498-25473-1-git-send-email-martin@barkynet.com> Subject: [Buildroot] [v2 2/6] package/nodejs: Update to allow selecting node.js version X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Martin Bark --- Changes v1 -> v2 - Updated to node.js v0.10.39 Signed-off-by: Martin Bark --- .../{ => 0.10.39}/0001-remove-python-bz2-dependency.patch | 0 .../0002-gyp-force-link-command-to-use-CXX.patch | 0 .../nodejs/{ => 0.10.39}/0003-use-python-variable.patch | 0 .../0004-fix-build-error-without-OpenSSL-support.patch | 0 package/nodejs/Config.in | 14 ++++++++++++++ package/nodejs/nodejs.mk | 2 +- 6 files changed, 15 insertions(+), 1 deletion(-) rename package/nodejs/{ => 0.10.39}/0001-remove-python-bz2-dependency.patch (100%) rename package/nodejs/{ => 0.10.39}/0002-gyp-force-link-command-to-use-CXX.patch (100%) rename package/nodejs/{ => 0.10.39}/0003-use-python-variable.patch (100%) rename package/nodejs/{ => 0.10.39}/0004-fix-build-error-without-OpenSSL-support.patch (100%) diff --git a/package/nodejs/0001-remove-python-bz2-dependency.patch b/package/nodejs/0.10.39/0001-remove-python-bz2-dependency.patch similarity index 100% rename from package/nodejs/0001-remove-python-bz2-dependency.patch rename to package/nodejs/0.10.39/0001-remove-python-bz2-dependency.patch diff --git a/package/nodejs/0002-gyp-force-link-command-to-use-CXX.patch b/package/nodejs/0.10.39/0002-gyp-force-link-command-to-use-CXX.patch similarity index 100% rename from package/nodejs/0002-gyp-force-link-command-to-use-CXX.patch rename to package/nodejs/0.10.39/0002-gyp-force-link-command-to-use-CXX.patch diff --git a/package/nodejs/0003-use-python-variable.patch b/package/nodejs/0.10.39/0003-use-python-variable.patch similarity index 100% rename from package/nodejs/0003-use-python-variable.patch rename to package/nodejs/0.10.39/0003-use-python-variable.patch diff --git a/package/nodejs/0004-fix-build-error-without-OpenSSL-support.patch b/package/nodejs/0.10.39/0004-fix-build-error-without-OpenSSL-support.patch similarity index 100% rename from package/nodejs/0004-fix-build-error-without-OpenSSL-support.patch rename to package/nodejs/0.10.39/0004-fix-build-error-without-OpenSSL-support.patch diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in index 3140683..61419fd 100644 --- a/package/nodejs/Config.in +++ b/package/nodejs/Config.in @@ -22,6 +22,20 @@ comment "nodejs needs a toolchain w/ C++, threads" if BR2_PACKAGE_NODEJS +choice + prompt "Node.js Version" + default BR2_BR2_PACKAGE_NODEJS_0_10_39 + help + Select the version of Node.js you wish to use. + + config BR2_BR2_PACKAGE_NODEJS_0_10_39 + bool "v0.10.39" + +endchoice + +config BR2_PACKAGE_NODEJS_VERSION_STRING + string + default "0.10.39" if BR2_BR2_PACKAGE_NODEJS_0_10_39 menu "Module Selection" config BR2_PACKAGE_NODEJS_NPM diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 4293c70..59e03b0 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 0.10.39 +NODEJS_VERSION = $(call qstrip,$(BR2_PACKAGE_NODEJS_VERSION_STRING)) NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.gz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs zlib \