Commit 89fae0d0 authored by Paul Cercueil's avatar Paul Cercueil Committed by Peter Korsgaard
Browse files

nodejs: Add dependency on zlib 



Prior to this commit, nodejs would build zlib itself and link statically
to it.

Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent ccebe894

package/nodejs/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -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.

package/nodejs/nodejs.mk

+4 −2
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ 
NODEJS_VERSION = 0.10.30

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
@@ -32,6 +32,7 @@ define HOST_NODEJS_CONFIGURE_CMDS 
		--without-snapshot \

		--without-dtrace \

		--without-etw \

		--shared-zlib \

	)

endef
@@ -69,6 +70,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 \