From 81bb80c89d8051f412fde2f5964d057612c696c6 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Fri, 3 Jun 2016 20:15:45 +0100 Subject: [PATCH] package/nodejs: Update openssl to use NODEJS_CONF_OPTS Signed-off-by: Martin Bark Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/nodejs/nodejs.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 68adbff945..0938652a2a 100644 --- 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)) \