jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-31 07:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/nodejs: Update openssl to use NODEJS_CONF_OPTS

Browse Source 
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>
This commit is contained in:
Martin Bark 2016-06-03 20:15:45 +01:00 committed by Thomas Petazzoni
parent be0d8ecc27
commit 81bb80c89d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/nodejs/nodejs.mk
View File

@ -22,6 +22,9 @@ NODEJS_CONF_OPTS = \
ifeq ($(BR2_PACKAGE_OPENSSL),y) ifeq ($(BR2_PACKAGE_OPENSSL),y)
NODEJS_DEPENDENCIES += openssl NODEJS_DEPENDENCIES += openssl
NODEJS_CONF_OPTS += --shared-openssl
else
NODEJS_CONF_OPTS += --without-ssl
endif endif
ifeq ($(BR2_PACKAGE_ICU),y) ifeq ($(BR2_PACKAGE_ICU),y)
@ -107,7 +110,6 @@ define NODEJS_CONFIGURE_CMDS
PYTHON=$(HOST_DIR)/usr/bin/python2 \ PYTHON=$(HOST_DIR)/usr/bin/python2 \
$(HOST_DIR)/usr/bin/python2 ./configure \ $(HOST_DIR)/usr/bin/python2 ./configure \
--prefix=/usr \ --prefix=/usr \
$(if $(BR2_PACKAGE_OPENSSL),--shared-openssl,--without-ssl) \
$(if $(BR2_PACKAGE_NODEJS_NPM),,--without-npm) \ $(if $(BR2_PACKAGE_NODEJS_NPM),,--without-npm) \
--dest-cpu=$(NODEJS_CPU) \ --dest-cpu=$(NODEJS_CPU) \
$(if $(NODEJS_ARM_FP),--with-arm-float-abi=$(NODEJS_ARM_FP)) \ $(if $(NODEJS_ARM_FP),--with-arm-float-abi=$(NODEJS_ARM_FP)) \