| Message ID | 1407279442-15084-1-git-send-email-paul@crapouillou.net |
|---|---|
| State | Superseded |
| Headers | show |
Dear Paul Cercueil, On Wed, 6 Aug 2014 00:57:22 +0200, Paul Cercueil wrote: > 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 \ Ok. > $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS)) > -HOST_NODEJS_DEPENDENCIES = host-python > +HOST_NODEJS_DEPENDENCIES = host-python host-zlib So here you're adding host-zlib as a dependency of host-nodejs. > 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 \ However here you're only adding --shared-zlib to the target nodejs configure options. Shouldn't --shared-zlib also be passed in HOST_NODEJS_CONFIGURE_CMDS ? Thanks! Thomas
Dear Thomas, Le 06/08/2014 20:15, Thomas Petazzoni a écrit : > Dear Paul Cercueil, > > On Wed, 6 Aug 2014 00:57:22 +0200, Paul Cercueil wrote: > >> 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 \ > > Ok. > >> $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS)) >> -HOST_NODEJS_DEPENDENCIES = host-python >> +HOST_NODEJS_DEPENDENCIES = host-python host-zlib > > So here you're adding host-zlib as a dependency of host-nodejs. > >> 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 \ > > However here you're only adding --shared-zlib to the target nodejs > configure options. Shouldn't --shared-zlib also be passed in > HOST_NODEJS_CONFIGURE_CMDS ? You are correct - I didn't see that one. I will shortly send a V2 patch then. > Thanks! > > Thomas >
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 \
Prior to this commit, nodejs would build zlib itself and link statically to it. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- package/nodejs/Config.in | 1 + package/nodejs/nodejs.mk | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-)