mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-08-02 16:07:42 +00:00
nodejs: use the standard configure/make options
Also cleanup leading whitespace. Note that overloading LD in required to avoid linker failures. Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
8813aa2f89
commit
bde585518e
@ -23,7 +23,8 @@ define HOST_NODEJS_CONFIGURE_CMDS
|
|||||||
# NPM is non-functional without it, and host-openssl isn't part of
|
# NPM is non-functional without it, and host-openssl isn't part of
|
||||||
# buildroot.
|
# buildroot.
|
||||||
(cd $(@D); \
|
(cd $(@D); \
|
||||||
./configure \
|
$(HOST_CONFIGURE_OPTS) \
|
||||||
|
./configure \
|
||||||
--prefix=$(HOST_DIR)/usr \
|
--prefix=$(HOST_DIR)/usr \
|
||||||
--without-snapshot \
|
--without-snapshot \
|
||||||
--without-dtrace \
|
--without-dtrace \
|
||||||
@ -75,7 +76,9 @@ define NODEJS_CONFIGURE_CMDS
|
|||||||
endef
|
endef
|
||||||
|
|
||||||
define NODEJS_BUILD_CMDS
|
define NODEJS_BUILD_CMDS
|
||||||
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
|
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
|
||||||
|
$(TARGET_CONFIGURE_OPTS) \
|
||||||
|
LD="$(TARGET_CXX)"
|
||||||
endef
|
endef
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -107,7 +110,10 @@ endef
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
define NODEJS_INSTALL_TARGET_CMDS
|
define NODEJS_INSTALL_TARGET_CMDS
|
||||||
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) DESTDIR=$(TARGET_DIR) install
|
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install \
|
||||||
|
DESTDIR=$(TARGET_DIR) \
|
||||||
|
$(TARGET_CONFIGURE_OPTS) \
|
||||||
|
LD="$(TARGET_CXX)"
|
||||||
$(NODEJS_INSTALL_MODULES)
|
$(NODEJS_INSTALL_MODULES)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user