mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@db180c0
This commit is contained in:
TriForceX
30
package/linknx/0001-Link-with-libiconv-if-needed.patch
Normal file
30
package/linknx/0001-Link-with-libiconv-if-needed.patch
Normal file
@@ -0,0 +1,30 @@
|
||||
From 87373f6c2b48619bb11e566e5eb16ea49d47beb7 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
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 <fontaine.fabrice@gmail.com>
|
||||
[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
|
||||
|
||||
34
package/linknx/0002-configure.ac-always-define-CPPUNIT.patch
Normal file
34
package/linknx/0002-configure.ac-always-define-CPPUNIT.patch
Normal file
@@ -0,0 +1,34 @@
|
||||
From 1b4a770af42f7d33ad174524b94ea4d2fc7133da Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 21 Apr 2019 19:31:50 +0200
|
||||
Subject: [PATCH] configure.ac: always define CPPUNIT
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/4b042b7e18425690ec26b4977865516bedcb9edb
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/linknx/linknx/pull/42]
|
||||
---
|
||||
configure.ac | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 779fd6f..51d8ae6 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -145,8 +145,11 @@ if test x"$WITH_CPPUNIT" != xno; then
|
||||
AC_DEFINE([HAVE_CPPUNIT], [1], [cppunit])
|
||||
AC_SUBST(CPPUNIT_CFLAGS)
|
||||
AC_SUBST(CPPUNIT_LIBS)
|
||||
- ])
|
||||
+ AM_CONDITIONAL([CPPUNIT], true)
|
||||
+ ],[AM_CONDITIONAL([CPPUNIT], false)])
|
||||
fi
|
||||
+else
|
||||
+ AM_CONDITIONAL([CPPUNIT], false)
|
||||
fi
|
||||
|
||||
dnl #########################################################################
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From b4595154e84e21abdc0c89f937c410cf8280991c Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Mon, 13 May 2019 22:14:43 +0200
|
||||
Subject: [PATCH] src/Makefile.am: fix linking with log4cpp
|
||||
|
||||
linknx fails to build with log4cpp because LOG4CPP_CFLAGS (which
|
||||
contains -pthread) is added to AM_CPPFLAGS (which is not used at link
|
||||
time) instead of AM_CXXFLAGS:
|
||||
|
||||
/home/buildroot/autobuild/instance-0/output/host/bin/mipsel-linux-g++ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -o linknx linknx.o logger.o ruleserver.o objectcontroller.o eibclient.o threads.o timermanager.o persistentstorage.o xmlserver.o smsgateway.o emailgateway.o knxconnection.o services.o suncalc.o luacondition.o ioport.o ../ticpp/libticpp.a -L/home/buildroot/autobuild/instance-0/output/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib -lpthsem -L/home/buildroot/autobuild/instance-0/output/host/bin/../mipsel-buildroot-linux-gnu/sysroot/usr/lib -llog4cpp -lm
|
||||
/home/buildroot/autobuild/instance-0/output/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib/liblog4cpp.so: undefined reference to `pthread_key_create'
|
||||
|
||||
So move LOG4CPP_CFLAGS to AM_CXXFLAGS
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/1863f8f27041bc15ca68e786ba3b8e4764c40574
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: not sent yet]
|
||||
---
|
||||
src/Makefile.am | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 6a4f493..92d147c 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -6,6 +6,7 @@ else
|
||||
B64_CFLAGS=
|
||||
B64_LIBS=
|
||||
endif
|
||||
-AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/ticpp $(B64_CFLAGS) $(PTH_CPPFLAGS) $(LIBCURL_CPPFLAGS) $(LOG4CPP_CFLAGS) $(LUA_CFLAGS) $(MYSQL_CFLAGS) $(ESMTP_CFLAGS)
|
||||
+AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/ticpp $(B64_CFLAGS) $(PTH_CPPFLAGS) $(LIBCURL_CPPFLAGS) $(LUA_CFLAGS) $(MYSQL_CFLAGS) $(ESMTP_CFLAGS)
|
||||
+AM_CXXFLAGS=$(LOG4CPP_CFLAGS)
|
||||
linknx_LDADD=$(top_srcdir)/ticpp/libticpp.a $(B64_LIBS) $(PTH_LDFLAGS) $(PTH_LIBS) $(LIBCURL) $(LOG4CPP_LIBS) $(LUA_LIBS) $(MYSQL_LIBS) $(ESMTP_LIBS) -lm
|
||||
linknx_SOURCES=linknx.cpp logger.cpp ruleserver.cpp objectcontroller.cpp eibclient.c threads.cpp timermanager.cpp persistentstorage.cpp xmlserver.cpp smsgateway.cpp emailgateway.cpp knxconnection.cpp services.cpp suncalc.cpp luacondition.cpp ioport.cpp ruleserver.h objectcontroller.h threads.h timermanager.h persistentstorage.h xmlserver.h smsgateway.h emailgateway.h knxconnection.h services.h suncalc.h luacondition.h ioport.h logger.h
|
||||
--
|
||||
2.20.1
|
||||
|
||||
18
package/linknx/Config.in
Normal file
18
package/linknx/Config.in
Normal file
@@ -0,0 +1,18 @@
|
||||
config BR2_PACKAGE_LINKNX
|
||||
bool "linknx"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_USE_MMU # libpthsem
|
||||
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.
|
||||
|
||||
http://linknx.sourceforge.net/
|
||||
https://github.com/linknx/linknx
|
||||
|
||||
comment "linknx needs a toolchain w/ C++"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_INSTALL_LIBSTDCPP
|
||||
3
package/linknx/linknx.hash
Normal file
3
package/linknx/linknx.hash
Normal file
@@ -0,0 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 3c3aaf8c409538153b15f5fb975a4485e58c4820cfea289a3f20777ba69782ab linknx-0.0.1.37.tar.gz
|
||||
sha256 c03cea027b4b40e4402fabd08557736727ec3d5bc54ad64ab6472de432198cad LICENSE
|
||||
52
package/linknx/linknx.mk
Normal file
52
package/linknx/linknx.mk
Normal file
@@ -0,0 +1,52 @@
|
||||
################################################################################
|
||||
#
|
||||
# linknx
|
||||
#
|
||||
################################################################################
|
||||
|
||||
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-pth-test \
|
||||
--with-pth=$(STAGING_DIR)/usr \
|
||||
--disable-smtp
|
||||
|
||||
LINKNX_DEPENDENCIES = libpthsem \
|
||||
$(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
|
||||
LINKNX_DEPENDENCIES += libcurl
|
||||
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
|
||||
else
|
||||
LINKNX_CONF_OPTS += --without-lua
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MYSQL),y)
|
||||
LINKNX_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr
|
||||
LINKNX_DEPENDENCIES += mysql
|
||||
else
|
||||
LINKNX_CONF_OPTS += --without-mysql
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user