diff options
| author | Martin Bark <martin@barkynet.com> | 2016-06-03 20:15:45 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-06-04 14:32:05 +0200 |
| commit | 81bb80c89d8051f412fde2f5964d057612c696c6 (patch) | |
| tree | 1d7cf92f0d27045e695418ae69bbc933e138d90e /package/nodejs | |
| parent | be0d8ecc2762b3a2547b91cf8471c2a4c28cc942 (diff) | |
| download | buildroot-81bb80c89d8051f412fde2f5964d057612c696c6.tar.gz buildroot-81bb80c89d8051f412fde2f5964d057612c696c6.zip | |
package/nodejs: Update openssl to use NODEJS_CONF_OPTS
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>
Diffstat (limited to 'package/nodejs')
| -rw-r--r-- | package/nodejs/nodejs.mk | 4 |
1 files changed, 3 insertions, 1 deletions
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)) \ |
