package/linknx: add license file
PATCH 1/3 package/linknx: add license file
LICENSE has been added in version 0.0.1.32 with
https://github.com/linknx/linknx/commit/74671aa27931be40662c0266441c7470dc11d595
So add it to LINKNX_LICENSE_FILES as well as its hash
--- package/linknx/linknx.hash | 1 + package/linknx/linknx.mk | 1 + 2 files changed, 2 insertions(+)
package/linknx/linknx.hash +1 -0
@@ -1,2 +1,3 @@ # Locally computed: sha256 635b8fbd3477fd7d85a95955b93f327cd5a389db80dc18cdae04de19a3a8a972 linknx-0.0.1.33.tar.gz +sha256 c03cea027b4b40e4402fabd08557736727ec3d5bc54ad64ab6472de432198cad LICENSE
package/linknx/linknx.mk +1 -0
@@ -7,6 +7,7 @@ LINKNX_VERSION = 0.0.1.33 LINKNX_SITE = $(call github,linknx,linknx,$(LINKNX_VERSION)) LINKNX_LICENSE = GPL-2.0+ +LINKNX_LICENSE_FILES = LICENSE LINKNX_INSTALL_STAGING = YES LINKNX_CONF_OPTS = \ --without-log4cpp \
Signature · 1 line
2.20.1
PATCH 2/3 package/linknx: bump to version 0.0.1.37
- Remove patch, not needed since:
https://github.com/linknx/linknx/commit/6166831eff645f21a7fd22ec3f7855f36005b8d9
- Needs iconv.h since version 0.0.1.34 and
https://github.com/linknx/linknx/commit/2cc3a93dcf2703b3b418e0a99975f556354fb1b1
- Add a patch to fix link with libiconv
- Disable cppunit (autodetect by default), added with:
https://github.com/linknx/linknx/commit/ee2efcde549dda82fdabde4af6d08871689cbb61
--- .../0001-Link-with-libiconv-if-needed.patch | 30 +++++++++++++ ...c-suncalc.cpp-fix-build-with-gcc-6.x.patch | 42 ------------------- package/linknx/Config.in | 1 + package/linknx/linknx.hash | 2 +- package/linknx/linknx.mk | 8 +++- 5 files changed, 38 insertions(+), 45 deletions(-) create mode 100644 package/linknx/0001-Link-with-libiconv-if-needed.patch delete mode 100644 package/linknx/0001-src-suncalc.cpp-fix-build-with-gcc-6.x.patch
package/linknx/0001-Link-with-libiconv-if-needed.patch new file +30 -0
@@ -0,0 +1,30 @@ +From 87373f6c2b48619bb11e566e5eb16ea49d47beb7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Fri, 19 Apr 2019 17:07:10 +0200 +Subject: [PATCH] Link with libiconv if needed + +Commit 2cc3a93dcf2703b3b418e0a99975f556354fb1b1 added an include to +iconv which can be provided by libiconv so search and link for it if +needed + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Upstream status: https://github.com/linknx/linknx/pull/41] +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 22f242c..779fd6f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -15,6 +15,7 @@ AC_CHECK_HEADER(argp.h,,[AC_MSG_ERROR([argp_parse not found])]) + AC_SEARCH_LIBS(argp_parse,argp,,[AC_MSG_ERROR([argp_parse not found])]) + + # Checks for libraries. ++AC_SEARCH_LIBS(libiconv_open,iconv) + LIBCURL_CHECK_CONFIG([yes], [7.14.0]) + + # Checks for header files. +-- +2.20.1 +
package/linknx/0001-src-suncalc.cpp-fix-build-with-gcc-6.x.patch deleted +0 -42
42 lines not on this page · raw message
package/linknx/Config.in +1 -0
@@ -5,6 +5,7 @@ config BR2_PACKAGE_LINKNX select BR2_PACKAGE_LIBPTHSEM select BR2_PACKAGE_ARGP_STANDALONE \ if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help Linknx is an automation platform providing high level functionalities to EIB/KNX installation.
package/linknx/linknx.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed: -sha256 635b8fbd3477fd7d85a95955b93f327cd5a389db80dc18cdae04de19a3a8a972 linknx-0.0.1.33.tar.gz +sha256 3c3aaf8c409538153b15f5fb975a4485e58c4820cfea289a3f20777ba69782ab linknx-0.0.1.37.tar.gz sha256 c03cea027b4b40e4402fabd08557736727ec3d5bc54ad64ab6472de432198cad LICENSE
package/linknx/linknx.mk +6 -2
@@ -4,19 +4,23 @@ # ################################################################################ -LINKNX_VERSION = 0.0.1.33 +LINKNX_VERSION = 0.0.1.37 LINKNX_SITE = $(call github,linknx,linknx,$(LINKNX_VERSION)) LINKNX_LICENSE = GPL-2.0+ LINKNX_LICENSE_FILES = LICENSE LINKNX_INSTALL_STAGING = YES +# We're patching configure.ac +LINKNX_AUTORECONF = YES LINKNX_CONF_OPTS = \ + --without-cppunit \ --without-log4cpp \ --without-pth-test \ --with-pth=$(STAGING_DIR)/usr \ --disable-smtp LINKNX_DEPENDENCIES = libpthsem \ - $(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone) + $(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone) \ + $(if $(BR2_PACKAGE_LIBICONV),libiconv) ifeq ($(BR2_PACKAGE_LIBCURL),y) LINKNX_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr
Signature · 1 line
2.20.1
PATCH 3/3 package/linknx: add optional log4cpp dependency
In reply to Fabrice Fontaine--- package/linknx/linknx.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
package/linknx/linknx.mk +7 -1
@@ -13,7 +13,6 @@ LINKNX_INSTALL_STAGING = YES LINKNX_AUTORECONF = YES LINKNX_CONF_OPTS = \ --without-cppunit \ - --without-log4cpp \ --without-pth-test \ --with-pth=$(STAGING_DIR)/usr \ --disable-smtp
@@ -29,6 +28,13 @@ else LINKNX_CONF_OPTS += --without-libcurl endif +ifeq ($(BR2_PACKAGE_LOG4CPP),y) +LINKNX_CONF_OPTS += --with-log4cpp +LINKNX_DEPENDENCIES += host-pkgconf log4cpp +else +LINKNX_CONF_OPTS += --without-log4cpp +endif + ifeq ($(BR2_PACKAGE_LUA),y) LINKNX_CONF_OPTS += --with-lua LINKNX_DEPENDENCIES += lua
Signature · 1 line
2.20.1
PATCH 1/3 package/linknx: add license file
In reply to Fabrice FontaineQuoted 10 lines · On Sat, 20 Apr 2019 22:42:50 +0200 Fabrice Fontaine…
LICENSE has been added in version 0.0.1.32 with
https://github.com/linknx/linknx/commit/74671aa27931be40662c0266441c7470dc11d595So add it to
LINKNX_LICENSE_FILESas well as its hashSigned-off-by Fabrice Fontaine <[email protected]>--- package/linknx/linknx.hash | 1 + package/linknx/linknx.mk | 1 + 2 files changed, 2 insertions(+)
Series applied. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/3 package/linknx: add license file
In reply to Fabrice FontaineQuoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
LICENSE has been added in version 0.0.1.32 with
https://github.com/linknx/linknx/commit/74671aa27931be40662c0266441c7470dc11d595So add it to
LINKNX_LICENSE_FILESas well as its hashSigned-off-by Fabrice Fontaine <[email protected]>
Committed to 2019.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard