From 8dd99f4f7fd3d7ca5333fba58b709a235919dbb0 Mon Sep 17 00:00:00 2001 From: Dominik Menke Date: Tue, 13 Dec 2016 15:42:41 +0100 Subject: [PATCH] libuecc: use shared instead of static library This patch prepares for another future package (ecdsautils), which builds multiple binaries all linked to libuecc. The changes are a direct copy of [1]. The original commit message was: > commit cb2ecbfdf0c478568a28aacb99d30fd6ee5c0dd1 > 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 [1]: https://github.com/freifunk-gluon/gluon/blob/cb2ecbfdf0c478568a28aacb99d30fd6ee5c0dd1/patches/packages/openwrt/0007-libuecc-use-shared-instead-of-static-library.patch Signed-off-by: Dominik Menke --- libs/libuecc/Makefile | 9 +++++++-- net/fastd/Makefile | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libs/libuecc/Makefile b/libs/libuecc/Makefile index c1ba53f854..8111062421 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 5c550d8a5f..aeaa1dfcf6 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