* [Buildroot] [git commit] nodejs: Add dependency on zlib
@ 2014-09-01 13:24 Peter Korsgaard
0 siblings, 0 replies; only message in thread
From: Peter Korsgaard @ 2014-09-01 13:24 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=89fae0d05daa8645ae3078746065ebed5c3c049f
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
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>
---
package/nodejs/Config.in | 1 +
package/nodejs/nodejs.mk | 6 ++++--
2 files changed, 5 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 d59fb57..ed09b53 100644
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@@ -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 \
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-09-01 13:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-01 13:24 [Buildroot] [git commit] nodejs: Add dependency on zlib Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.