Kaynağa Gözat

package/nodejs: use shared c-ares

nodejs requires c-ares and by default will use an internal copy
bundled with the release.  Change to using a shared c-ares library.

Signed-off-by: Martin Bark <martin@barkynet.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Martin Bark 8 yıl önce
ebeveyn
işleme
653bcf477a
2 değiştirilmiş dosya ile 3 ekleme ve 1 silme
  1. 1 0
      package/nodejs/Config.in
  2. 2 1
      package/nodejs/nodejs.mk

+ 1 - 0
package/nodejs/Config.in

@@ -24,6 +24,7 @@ config BR2_PACKAGE_NODEJS
 	# uses dlopen(). On ARMv5, we could technically support static
 	# uses dlopen(). On ARMv5, we could technically support static
 	# linking, but that's too much of a corner case to support it.
 	# linking, but that's too much of a corner case to support it.
 	depends on !BR2_STATIC_LIBS
 	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_C_ARES
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_ZLIB
 	help
 	help
 	  Event-driven I/O server-side JavaScript environment based on V8.
 	  Event-driven I/O server-side JavaScript environment based on V8.

+ 2 - 1
package/nodejs/nodejs.mk

@@ -7,7 +7,7 @@
 NODEJS_VERSION = 8.1.4
 NODEJS_VERSION = 8.1.4
 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz
 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz
 NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION)
 NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION)
-NODEJS_DEPENDENCIES = host-python host-nodejs zlib \
+NODEJS_DEPENDENCIES = host-python host-nodejs c-ares zlib \
 	$(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS))
 	$(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS))
 HOST_NODEJS_DEPENDENCIES = host-python host-zlib
 HOST_NODEJS_DEPENDENCIES = host-python host-zlib
 NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components)
 NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components)
@@ -16,6 +16,7 @@ NODEJS_LICENSE_FILES = LICENSE
 NODEJS_CONF_OPTS = \
 NODEJS_CONF_OPTS = \
 	--without-snapshot \
 	--without-snapshot \
 	--shared-zlib \
 	--shared-zlib \
+	--shared-cares \
 	--without-dtrace \
 	--without-dtrace \
 	--without-etw \
 	--without-etw \
 	--dest-os=linux
 	--dest-os=linux