Browse Source

Merge pull request #9628 from nxhack/node_darwin_compat

node: fix host build error on macOS
lilik-openwrt-22.03
Daniel Engberg 5 years ago
committed by GitHub
parent
commit
ed385cf97b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
  1. +2
    -2
      lang/node/Makefile
  2. +11
    -0
      lang/node/patches/007-fix_host_build_on_macos.patch

+ 2
- 2
lang/node/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=node PKG_NAME:=node
PKG_VERSION:=v8.16.0 PKG_VERSION:=v8.16.0
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=node-$(PKG_VERSION).tar.xz PKG_SOURCE:=node-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://nodejs.org/dist/${PKG_VERSION} PKG_SOURCE_URL:=https://nodejs.org/dist/${PKG_VERSION}
PKG_HASH:=3515e8e01568a5dc4dff3d91a76ebc6724f5fa2fbb58b4b0c5da7b178a2f7340 PKG_HASH:=3515e8e01568a5dc4dff3d91a76ebc6724f5fa2fbb58b4b0c5da7b178a2f7340
@ -103,7 +103,7 @@ CONFIGURE_ARGS:= \
HOST_CONFIGURE_VARS:= HOST_CONFIGURE_VARS:=
HOST_CONFIGURE_ARGS:= \ HOST_CONFIGURE_ARGS:= \
--dest-os=linux \
--dest-os=$(if $(findstring Darwin,$(HOST_OS)),mac,linux) \
--without-snapshot \ --without-snapshot \
--prefix=$(STAGING_DIR_HOSTPKG) --prefix=$(STAGING_DIR_HOSTPKG)


+ 11
- 0
lang/node/patches/007-fix_host_build_on_macos.patch View File

@ -0,0 +1,11 @@
--- a/tools/gyp/pylib/gyp/generator/make.py
+++ b/tools/gyp/pylib/gyp/generator/make.py
@@ -174,7 +174,7 @@
LINK_COMMANDS_MAC = """\
quiet_cmd_alink = LIBTOOL-STATIC $@
-cmd_alink = rm -f $@ && ./gyp-mac-tool filter-libtool libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %.o,$^)
+cmd_alink = rm -f $@ && ./gyp-mac-tool filter-libtool /usr/bin/libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %.o,$^)
quiet_cmd_link = LINK($(TOOLSET)) $@
cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o "$@" $(LD_INPUTS) $(LIBS)

Loading…
Cancel
Save