From 3262c3522cda63cdcfa53dba54a643041fcde04e Mon Sep 17 00:00:00 2001 From: Othmar Truniger Date: Wed, 14 Feb 2018 20:10:08 +0100 Subject: [PATCH 1/2] libfmt: add new package (closes #5617) Signed-off-by: Othmar Truniger Build shared library, add license file hints Signed-off-by: Michael Heimpold --- libs/libfmt/Makefile | 63 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 libs/libfmt/Makefile diff --git a/libs/libfmt/Makefile b/libs/libfmt/Makefile new file mode 100644 index 0000000000..d3c07e638c --- /dev/null +++ b/libs/libfmt/Makefile @@ -0,0 +1,63 @@ +# +# Copyright (C) 2018 Othmar Truniger +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libfmt +PKG_VERSION:=4.1.0 +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/fmtlib/fmt.git +PKG_SOURCE_VERSION:=$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_MIRROR_HASH:=112c964c1537fbc2f3a993f405547fc57b0f3d1524c808006920c53fab42c233 + +PKG_MAINTAINER:=Othmar Truniger +PKG_LICENSE:=BSD-2-Clause +PKG_LICENSE_FILES:=LICENSE.rst + +CMAKE_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +CMAKE_OPTIONS += -DBUILD_SHARED_LIBS=ON +CMAKE_OPTIONS += -DFMT_DOC=OFF +CMAKE_OPTIONS += -DFMT_TEST=OFF + +define Package/libfmt + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Small, safe and fast formatting library + URL:=https://github.com/fmtlib/fmt + DEPENDS:=+libstdcpp +endef + +define Package/libfmt/description + fmt is an open-source formatting library for C++. + It can be used as a safe alternative to printf or as a fast alternative to IOStreams. +endef + +define Package/libfmt/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfmt.so* $(1)/usr/lib/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include/fmt + $(CP) $(PKG_INSTALL_DIR)/usr/include/fmt/*.h $(1)/usr/include/fmt/ + + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfmt.so* $(1)/usr/lib/ + + $(INSTALL_DIR) $(1)/usr/lib/cmake + $(CP) $(PKG_INSTALL_DIR)/usr/lib/cmake/* $(1)/usr/lib/cmake/ +endef + +$(eval $(call BuildPackage,libfmt)) From dbe8f4099fe45c7eef0032d145bf73e08bf504ac Mon Sep 17 00:00:00 2001 From: Othmar Truniger Date: Wed, 21 Mar 2018 16:27:20 +0100 Subject: [PATCH 2/2] knxd: add dependency on libfmt (closes #5793) Signed-off-by: Othmar Truniger Signed-off-by: Michael Heimpold --- net/knxd/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/knxd/Makefile b/net/knxd/Makefile index 7e3c28cfdd..7cd65cac4c 100644 --- a/net/knxd/Makefile +++ b/net/knxd/Makefile @@ -12,14 +12,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=knxd PKG_VERSION:=0.14.24 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/knxd/knxd.git -PKG_SOURCE_VERSION:=10f702e112ffb2ada50efd33ea5cdce3f6ce1f6e +PKG_SOURCE_VERSION:=d29f7047a8b20a7ac57c3c9ad349c12be60f9fee PKG_SOURCE_SUBDIR:=$(PKG_NAME) PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_HASH:=f2e18dfbe02e9f8cbebd7b31652c4d7be4e63af23d4635316a14a1fe6184a399 +PKG_MIRROR_HASH:=07857ce8c7c8be965b1baf81566671ab89c3ae8bbcd8f1fe05df0c38a4465664 PKG_MAINTAINER:=Othmar Truniger @@ -39,7 +39,7 @@ define Package/knxd SECTION:=net CATEGORY:=Network TITLE:=EIB KNX daemon - DEPENDS:=+libusb-1.0 +libstdcpp +libev + DEPENDS:=+libusb-1.0 +libstdcpp +libev +libfmt endef define Package/knxd/description