From cb2ecbfdf0c478568a28aacb99d30fd6ee5c0dd1 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 28 Jul 2016 01:06:56 +0200 Subject: [PATCH] Make libuecc a shared library, update Gluon packages --- modules | 2 +- ...use-shared-instead-of-static-library.patch | 68 +++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 patches/packages/openwrt/0007-libuecc-use-shared-instead-of-static-library.patch diff --git a/modules b/modules index 3c887d0e..9d96fd7e 100644 --- a/modules +++ b/modules @@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=73776792f7d58e982be9e5819450d4875b273159 PACKAGES_OPENWRT_BRANCH=for-15.05 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=6a618e61da2425ad2ed2f4bf637569d57bb40a3f +PACKAGES_GLUON_COMMIT=0a6411b56b9edeba1809ffe45c03dbb7261bf45c PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=a4eae82c155079a4372e4b910ec733f77288b717 diff --git a/patches/packages/openwrt/0007-libuecc-use-shared-instead-of-static-library.patch b/patches/packages/openwrt/0007-libuecc-use-shared-instead-of-static-library.patch new file mode 100644 index 00000000..27ec355a --- /dev/null +++ b/patches/packages/openwrt/0007-libuecc-use-shared-instead-of-static-library.patch @@ -0,0 +1,68 @@ +From: Matthias Schiffer +Date: Tue, 3 May 2016 21:33:34 +0200 +Subject: libuecc: use shared instead of static library + +Signed-off-by: Matthias Schiffer + +diff --git a/libs/libuecc/Makefile b/libs/libuecc/Makefile +index c1ba53f..8111062 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 + 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 5c550d8..aeaa1df 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 + 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