Browse Source

Merge branch 'libfmt-knxd'

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
lilik-openwrt-22.03
Michael Heimpold 7 years ago
parent
commit
a1ef3172fd
2 changed files with 67 additions and 4 deletions
  1. +63
    -0
      libs/libfmt/Makefile
  2. +4
    -4
      net/knxd/Makefile

+ 63
- 0
libs/libfmt/Makefile View File

@ -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 <github@truniger.ch>
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))

+ 4
- 4
net/knxd/Makefile View File

@ -12,14 +12,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=knxd PKG_NAME:=knxd
PKG_VERSION:=0.14.24 PKG_VERSION:=0.14.24
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/knxd/knxd.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_SUBDIR:=$(PKG_NAME)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MIRROR_HASH:=f2e18dfbe02e9f8cbebd7b31652c4d7be4e63af23d4635316a14a1fe6184a399
PKG_MIRROR_HASH:=07857ce8c7c8be965b1baf81566671ab89c3ae8bbcd8f1fe05df0c38a4465664
PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch> PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch>
@ -39,7 +39,7 @@ define Package/knxd
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
TITLE:=EIB KNX daemon TITLE:=EIB KNX daemon
DEPENDS:=+libusb-1.0 +libstdcpp +libev
DEPENDS:=+libusb-1.0 +libstdcpp +libev +libfmt
endef endef
define Package/knxd/description define Package/knxd/description


Loading…
Cancel
Save