gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nodejs: Add dependency on zlib 

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

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Paul Cercueil 2014-08-15 19:20:03 +02:00 committed by Peter Korsgaard
parent ccebe8949f
commit 89fae0d05d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/nodejs/Config.in
View File

@ -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.

6
package/nodejs/nodejs.mk
View File

@ -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 \