2483673439
This updates: * node * node-arduino-firmata * node-cylon * node-hid * node-serialport to their version used in LEDE v17.01.6. This fixes compile errors appearing on Debian Sid. A list of the patches picked from upstream (x'd ones excluded): $ git log --oneline 8ca186cd59..HEAD lang/node lang/node-arduino-firmata/ lang/node-cylon/ lang/node-hid/ lang/node-serialport/ x 4a984a8d6 treewide: replace $(STAGING_DIR)/host and $(HOST_BUILD_PREFIX) with $(STAGING_DIR_HOSTPKG) x 844638d51 Merge pull request #3056 from plntyk/fix_node 0da71b8f8 node: use default host install prefix def97187d Treewide fix of typo: PKG_LICENSE_FILE --> PKG_LICENSE_FILES bc86e32d4 node: fix soft/hard float compile on arm/mips 865f44ef7 node,node-*: node update to v4.4.5 and Enhance CPU-arch variant. a3148b64e node-hid: fix git submodule issue aa9202fac node-hid: fix compile error c9115cdf5 node-*: node update to v4.4.4 x bbce5fce7 node: fix undefined behaviour leading to broken code with GCC 6 9125c3615 node: update to v4.4.4 5a118cda9 node update v0.12.13 x fb744a658 Merge pull request #2486 from yousong/cp-fix bca789b6b node-* : specify npm_config_cache directory ac000220c node-* : specify npm_config_cache directory 47f466e88 node-* : specify npm_config_cache directory 10c6b4110 node-* : specify npm_config_cache directory a82363f0a node-serialport: add node host dependency 0498c8ae2 node-hid: add node host dependency a64623683 node-cylon: add node host dependency 2b8a17de0 node-arduino-firmata: add node host dependency 92b0575e2 Drop the redundant -r option to $(CP) x 9f8e5aca3 treewide: use $(STAGING_DIR)/host instead of $(STAGING_DIR_HOST), sync with changes in trunk e5ca27a97 node: fix build on x86 & x86.64 targets x 659719005 node: add python/host to HOST_BUILD_DEPENDS as well Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
69 lines
2.3 KiB
Diff
69 lines
2.3 KiB
Diff
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
Date: Tue, 3 May 2016 21:33:34 +0200
|
|
Subject: libuecc: use shared instead of static library
|
|
|
|
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
|
|
diff --git a/libs/libuecc/Makefile b/libs/libuecc/Makefile
|
|
index c1ba53f854b5f0e29728f0a4d2e8f682ff8357a3..81110624212291d86631a7b56232208459b004da 100644
|
|
--- a/libs/libuecc/Makefile
|
|
+++ b/libs/libuecc/Makefile
|
|
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=libuecc
|
|
PKG_VERSION:=7
|
|
-PKG_RELEASE:=1
|
|
+PKG_RELEASE:=2
|
|
|
|
PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
|
@@ -35,11 +35,16 @@ CMAKE_OPTIONS += \
|
|
-DCMAKE_BUILD_TYPE:String="MINSIZEREL"
|
|
|
|
|
|
+define Package/libuecc/install
|
|
+ $(INSTALL_DIR) $(1)/usr/lib
|
|
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuecc.so* $(1)/usr/lib/
|
|
+endef
|
|
+
|
|
define Build/InstallDev
|
|
$(INSTALL_DIR) $(1)/usr/include
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/include/libuecc-$(PKG_VERSION) $(1)/usr/include/
|
|
$(INSTALL_DIR) $(1)/usr/lib
|
|
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuecc.a $(1)/usr/lib/
|
|
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuecc.so* $(1)/usr/lib/
|
|
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libuecc.pc $(1)/usr/lib/pkgconfig/
|
|
endef
|
|
diff --git a/net/fastd/Makefile b/net/fastd/Makefile
|
|
index 5c550d8a5f4669d4f018dde23b622376bc8d0b06..aeaa1dfcf682a5c2b048d636b549953035fdbf0d 100644
|
|
--- a/net/fastd/Makefile
|
|
+++ b/net/fastd/Makefile
|
|
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=fastd
|
|
PKG_VERSION:=18
|
|
-PKG_RELEASE:=1
|
|
+PKG_RELEASE:=2
|
|
|
|
PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
|
@@ -43,7 +43,7 @@ PKG_CONFIG_DEPENDS:=\
|
|
CONFIG_FASTD_WITH_STATUS_SOCKET
|
|
|
|
|
|
-PKG_BUILD_DEPENDS:=nacl libuecc
|
|
+PKG_BUILD_DEPENDS:=nacl
|
|
|
|
include $(INCLUDE_DIR)/package.mk
|
|
include $(INCLUDE_DIR)/cmake.mk
|
|
@@ -51,7 +51,7 @@ include $(INCLUDE_DIR)/cmake.mk
|
|
define Package/fastd
|
|
SECTION:=net
|
|
CATEGORY:=Network
|
|
- DEPENDS:=+kmod-tun +librt +libpthread +FASTD_WITH_STATUS_SOCKET:libjson-c +FASTD_WITH_CAPABILITIES:libcap
|
|
+ DEPENDS:=+kmod-tun +librt +libpthread +libuecc +FASTD_WITH_STATUS_SOCKET:libjson-c +FASTD_WITH_CAPABILITIES:libcap
|
|
TITLE:=Fast and Secure Tunneling Daemon
|
|
URL:=https://projects.universe-factory.net/projects/fastd
|
|
SUBMENU:=VPN
|