Merge pull request #7608 from cotequeiroz/node-xXx_fix-symlinks

fixup: Node-{arduino-firmata,cylon,hid,serialport}: fix symlinks
This commit is contained in:
Hannu Nyman 2018-12-07 20:25:26 +02:00 committed by GitHub
commit 1c5a5d59f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 5 deletions

View file

@ -49,12 +49,13 @@ endef
EXTRA_LDFLAGS="-L$(TOOLCHAIN_DIR)/lib/ -Wl,-rpath-link $(TOOLCHAIN_DIR)/lib/" \ EXTRA_LDFLAGS="-L$(TOOLCHAIN_DIR)/lib/ -Wl,-rpath-link $(TOOLCHAIN_DIR)/lib/" \
define Build/Compile define Build/Compile
cd $(PKG_BUILD_DIR) ; \
$(MAKE_FLAGS) \ $(MAKE_FLAGS) \
npm_config_arch=$(CONFIG_ARCH) \ npm_config_arch=$(CONFIG_ARCH) \
npm_config_nodedir=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/ \ npm_config_nodedir=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/ \
npm_config_cache=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/npm-cache \ npm_config_cache=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/npm-cache \
PREFIX="$(PKG_INSTALL_DIR)/usr/" \ PREFIX="$(PKG_INSTALL_DIR)/usr/" \
npm install -g $(PKG_BUILD_DIR) npm install -g `npm pack $(PKG_BUILD_DIR) | tail -n 1`
endef endef
define Package/node-arduino-firmata/install define Package/node-arduino-firmata/install

View file

@ -65,12 +65,13 @@ endef
EXTRA_LDFLAGS="-L$(TOOLCHAIN_DIR)/lib/ -Wl,-rpath-link $(TOOLCHAIN_DIR)/lib/" \ EXTRA_LDFLAGS="-L$(TOOLCHAIN_DIR)/lib/ -Wl,-rpath-link $(TOOLCHAIN_DIR)/lib/" \
define Build/Compile define Build/Compile
cd $(PKG_BUILD_DIR) ; \
$(MAKE_FLAGS) \ $(MAKE_FLAGS) \
npm_config_arch=$(CONFIG_ARCH) \ npm_config_arch=$(CONFIG_ARCH) \
npm_config_nodedir=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/ \ npm_config_nodedir=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/ \
npm_config_cache=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/npm-cache \ npm_config_cache=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/npm-cache \
PREFIX="$(PKG_INSTALL_DIR)/usr/" \ PREFIX="$(PKG_INSTALL_DIR)/usr/" \
npm install -g $(PKG_BUILD_DIR) npm install -g `npm pack $(PKG_BUILD_DIR) | tail -n 1`
endef endef
define Package/node-cylon/install define Package/node-cylon/install

View file

@ -34,7 +34,7 @@ define Package/node-hid
CATEGORY:=Languages CATEGORY:=Languages
TITLE:=Node.js package to access HID devices TITLE:=Node.js package to access HID devices
URL:=https://github.com/node-hid/node-hid URL:=https://github.com/node-hid/node-hid
DEPENDS:=+node +node-npm +libusb-1.0 +hidapi +libstdcpp DEPENDS:=+node +node-npm +libusb-1.0 +hidapi +libstdcpp +libudev-fbsd
endef endef
define Package/node-hid/description define Package/node-hid/description
@ -47,13 +47,15 @@ EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include/libusb-1.0
define Build/Compile define Build/Compile
git init $(PKG_BUILD_DIR) git init $(PKG_BUILD_DIR)
cd $(PKG_BUILD_DIR) ; \
$(MAKE_VARS) \ $(MAKE_VARS) \
$(MAKE_FLAGS) \ $(MAKE_FLAGS) \
npm_config_arch=$(CONFIG_ARCH) \ npm_config_arch=$(CONFIG_ARCH) \
npm_config_nodedir=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/ \ npm_config_nodedir=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/ \
npm_config_cache=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/npm-cache \ npm_config_cache=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/npm-cache \
PREFIX="$(PKG_INSTALL_DIR)/usr/" \ PREFIX="$(PKG_INSTALL_DIR)/usr/" \
npm install --build-from-source --target_arch=$(CPU) -g $(PKG_BUILD_DIR) npm install --build-from-source --target_arch=$(CPU) -g \
`npm pack $(PKG_BUILD_DIR) | tail -n 1`
endef endef
define Package/node-hid/install define Package/node-hid/install

View file

@ -48,12 +48,14 @@ CPU:=$(subst x86_64,x64,$(subst i386,ia32,$(ARCH)))
EXTRA_LDFLAGS="-L$(TOOLCHAIN_DIR)/lib/ -Wl,-rpath-link $(TOOLCHAIN_DIR)/lib/" \ EXTRA_LDFLAGS="-L$(TOOLCHAIN_DIR)/lib/ -Wl,-rpath-link $(TOOLCHAIN_DIR)/lib/" \
define Build/Compile define Build/Compile
cd $(PKG_BUILD_DIR) ; \
$(MAKE_FLAGS) \ $(MAKE_FLAGS) \
npm_config_arch=$(CONFIG_ARCH) \ npm_config_arch=$(CONFIG_ARCH) \
npm_config_nodedir=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/ \ npm_config_nodedir=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/ \
npm_config_cache=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/npm-cache \ npm_config_cache=$(BUILD_DIR)/node-$(PKG_NODE_VERSION)/npm-cache \
PREFIX="$(PKG_INSTALL_DIR)/usr/" \ PREFIX="$(PKG_INSTALL_DIR)/usr/" \
npm install --build-from-source --target_arch=$(CPU) -g $(PKG_BUILD_DIR) npm install --build-from-source --target_arch=$(CPU) -g \
`npm pack $(PKG_BUILD_DIR) | tail -n 1`
endef endef
define Package/node-serialport/install define Package/node-serialport/install