projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: be0d8ec)
package/nodejs: Update openssl to use NODEJS_CONF_OPTS
authorMartin Bark <martin@barkynet.com>
Fri, 3 Jun 2016 19:15:45 +0000 (20:15 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sat, 4 Jun 2016 12:32:05 +0000 (14:32 +0200)
Signed-off-by: Martin Bark <martin@barkynet.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/nodejs/nodejs.mk patch | blob | history

diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
index 68adbff9453fa7690863a3cb35c25774f450c2da..0938652a2acf3ea4c614d75fe674eaa12c0ee363 100644 (file)
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@@ -22,6 +22,9 @@ NODEJS_CONF_OPTS = \
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 NODEJS_DEPENDENCIES += openssl
+NODEJS_CONF_OPTS += --shared-openssl
+else
+NODEJS_CONF_OPTS += --without-ssl
 endif
 
 ifeq ($(BR2_PACKAGE_ICU),y)
@@ -107,7 +110,6 @@ define NODEJS_CONFIGURE_CMDS
                PYTHON=$(HOST_DIR)/usr/bin/python2 \
                $(HOST_DIR)/usr/bin/python2 ./configure \
                --prefix=/usr \
-               $(if $(BR2_PACKAGE_OPENSSL),--shared-openssl,--without-ssl) \
                $(if $(BR2_PACKAGE_NODEJS_NPM),,--without-npm) \
                --dest-cpu=$(NODEJS_CPU) \
                $(if $(NODEJS_ARM_FP),--with-arm-float-abi=$(NODEJS_ARM_FP)) \