From patchwork Tue Aug 5 22:57:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 376814 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id F2E821400E4 for ; Wed, 6 Aug 2014 08:57:42 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 059C98B989; Tue, 5 Aug 2014 22:57:42 +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 CGqQvNpUAwRk; Tue, 5 Aug 2014 22:57:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id F26D08B996; Tue, 5 Aug 2014 22:57:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id AE27B1BF970 for ; Tue, 5 Aug 2014 22:57:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A9F458B996 for ; Tue, 5 Aug 2014 22:57:39 +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 XpkpoNlVmvkJ for ; Tue, 5 Aug 2014 22:57:38 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from marvin.crapouillou.net (rev33.vpn.fdn.fr [80.67.179.33]) by whitealder.osuosl.org (Postfix) with ESMTPS id ADB7D8B989 for ; Tue, 5 Aug 2014 22:57:38 +0000 (UTC) Received: from acaen-252-1-6-225.w90-62.abo.wanadoo.fr ([90.62.133.225] helo=localhost.localdomain) by marvin.crapouillou.net with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA256:128) (Exim 4.80) (envelope-from ) id 1XEnfi-0000CB-3B; Wed, 06 Aug 2014 00:57:34 +0200 From: Paul Cercueil To: buildroot@busybox.net Date: Wed, 6 Aug 2014 00:57:22 +0200 Message-Id: <1407279442-15084-1-git-send-email-paul@crapouillou.net> X-Mailer: git-send-email 2.0.1 Cc: Paul Cercueil Subject: [Buildroot] [PATCH] nodejs: Add dependency on zlib X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net Prior to this commit, nodejs would build zlib itself and link statically to it. Signed-off-by: Paul Cercueil --- package/nodejs/Config.in | 1 + package/nodejs/nodejs.mk | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in index 344b7f6..077a043 100644 --- a/package/nodejs/Config.in +++ b/package/nodejs/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_NODEJS depends on !(BR2_arm920t || BR2_arm922t || BR2_fa526) # uses fork() depends on BR2_USE_MMU + select BR2_PACKAGE_ZLIB help Event-driven I/O server-side JavaScript environment based on V8. diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index a85384e..ff44e01 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -7,9 +7,9 @@ NODEJS_VERSION = 0.10.12 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.gz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) -NODEJS_DEPENDENCIES = host-python host-nodejs \ +NODEJS_DEPENDENCIES = host-python host-nodejs zlib \ $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS)) -HOST_NODEJS_DEPENDENCIES = host-python +HOST_NODEJS_DEPENDENCIES = host-python host-zlib NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components) NODEJS_LICENSE_FILES = LICENSE @@ -69,6 +69,7 @@ define NODEJS_CONFIGURE_CMDS $(HOST_DIR)/usr/bin/python2 ./configure \ --prefix=/usr \ --without-snapshot \ + --shared-zlib \ $(if $(BR2_PACKAGE_OPENSSL),--shared-openssl,--without-ssl) \ $(if $(BR2_PACKAGE_NODEJS_NPM),,--without-npm) \ --without-dtrace \