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

package/nodejs: link with libatomic when needed

Browse Source 
Fixes:
 - http://autobuild.buildroot.net/results/804951467d3f5b212bd33b95dc8fe9c6f5f63838

Signed-off-by: Martin Bark <martin@barkynet.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Martin Bark 2019-03-17 20:48:00 +00:00 committed by Thomas Petazzoni
parent 30742cb4ee
commit 620038c149
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/nodejs/nodejs.mk
View File

@ -116,6 +116,12 @@ NODEJS_MIPS_ARCH_VARIANT = r1
endif endif
endif endif
NODEJS_LDFLAGS = $(TARGET_LDFLAGS)
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
NODEJS_LDFLAGS += -latomic
endif
define NODEJS_CONFIGURE_CMDS define NODEJS_CONFIGURE_CMDS
mkdir -p $(@D)/bin mkdir -p $(@D)/bin
ln -sf $(HOST_DIR)/bin/python2 $(@D)/bin/python ln -sf $(HOST_DIR)/bin/python2 $(@D)/bin/python
@ -123,6 +129,7 @@ define NODEJS_CONFIGURE_CMDS
(cd $(@D); \ (cd $(@D); \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
PATH=$(@D)/bin:$(BR_PATH) \ PATH=$(@D)/bin:$(BR_PATH) \
LDFLAGS="$(NODEJS_LDFLAGS)" \
LD="$(TARGET_CXX)" \ LD="$(TARGET_CXX)" \
PYTHON=$(HOST_DIR)/bin/python2 \ PYTHON=$(HOST_DIR)/bin/python2 \
$(HOST_DIR)/bin/python2 ./configure \ $(HOST_DIR)/bin/python2 ./configure \
@ -145,6 +152,7 @@ define NODEJS_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
NO_LOAD=cctest.target.mk \ NO_LOAD=cctest.target.mk \
PATH=$(@D)/bin:$(BR_PATH) \ PATH=$(@D)/bin:$(BR_PATH) \
LDFLAGS="$(NODEJS_LDFLAGS)" \
LD="$(TARGET_CXX)" LD="$(TARGET_CXX)"
endef endef
@ -156,6 +164,7 @@ NODEJS_MODULES_LIST= $(call qstrip,\
# Define NPM for other packages to use # Define NPM for other packages to use
NPM = $(TARGET_CONFIGURE_OPTS) \ NPM = $(TARGET_CONFIGURE_OPTS) \
LDFLAGS="$(NODEJS_LDFLAGS)" \
LD="$(TARGET_CXX)" \ LD="$(TARGET_CXX)" \
npm_config_arch=$(NODEJS_CPU) \ npm_config_arch=$(NODEJS_CPU) \
npm_config_target_arch=$(NODEJS_CPU) \ npm_config_target_arch=$(NODEJS_CPU) \
@ -184,6 +193,7 @@ define NODEJS_INSTALL_TARGET_CMDS
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
NO_LOAD=cctest.target.mk \ NO_LOAD=cctest.target.mk \
PATH=$(@D)/bin:$(BR_PATH) \ PATH=$(@D)/bin:$(BR_PATH) \
LDFLAGS="$(NODEJS_LDFLAGS)" \
LD="$(TARGET_CXX)" LD="$(TARGET_CXX)"
$(NODEJS_INSTALL_MODULES) $(NODEJS_INSTALL_MODULES)
endef endef