initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,47 @@
|
||||
From 8e7da14647dada5eee8f583b0814bffb31d1b91e Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 21 Apr 2019 23:17:34 +0200
|
||||
Subject: [PATCH] configure.ac: tweak CPPUNIT conditional
|
||||
|
||||
Following review of buildroot's patch
|
||||
(http://patchwork.ozlabs.org/patch/1088520), tweak CPPUNIT to move call
|
||||
to AM_CONDITIONAL outside condition
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from:
|
||||
https://github.com/linknx/linknx/commit/8e7da14647dada5eee8f583b0814bffb31d1b91e]
|
||||
---
|
||||
configure.ac | 10 ++++------
|
||||
1 file changed, 4 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 51d8ae66..4d9d8efa 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -135,22 +135,20 @@ 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)
|
||||
+ found_cppunit=yes
|
||||
],[
|
||||
AC_MSG_RESULT([no])
|
||||
- AM_CONDITIONAL(CPPUNIT, false)
|
||||
])
|
||||
else
|
||||
PKG_CHECK_MODULES(CPPUNIT, $CPPUNITPC >= 1.9.6, [
|
||||
AC_DEFINE([HAVE_CPPUNIT], [1], [cppunit])
|
||||
AC_SUBST(CPPUNIT_CFLAGS)
|
||||
AC_SUBST(CPPUNIT_LIBS)
|
||||
- AM_CONDITIONAL([CPPUNIT], true)
|
||||
- ],[AM_CONDITIONAL([CPPUNIT], false)])
|
||||
+ found_cppunit=yes
|
||||
+ ])
|
||||
fi
|
||||
-else
|
||||
- AM_CONDITIONAL([CPPUNIT], false)
|
||||
fi
|
||||
+AM_CONDITIONAL([CPPUNIT], [test x"$found_cppunit" = xyes])
|
||||
|
||||
dnl #########################################################################
|
||||
dnl Check if using log4cpp
|
||||
@@ -0,0 +1,37 @@
|
||||
From 048b9ae8f3c07be217f1738c35ab995ab6394453 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 8 Mar 2020 10:02:07 +0100
|
||||
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>
|
||||
[Retrieved from:
|
||||
https://github.com/linknx/linknx/commit/048b9ae8f3c07be217f1738c35ab995ab6394453]
|
||||
---
|
||||
src/Makefile.am | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 6e0dc03b..5065c248 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 $(LIBICONV) $(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
|
||||
@@ -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
|
||||
@@ -0,0 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 00c53776c2e871295459ede922402d8ad0208367d2364781fdb92ddafad94d3d linknx-0.0.1.38.tar.gz
|
||||
sha256 c03cea027b4b40e4402fabd08557736727ec3d5bc54ad64ab6472de432198cad LICENSE
|
||||
@@ -0,0 +1,56 @@
|
||||
################################################################################
|
||||
#
|
||||
# linknx
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LINKNX_VERSION = 0.0.1.38
|
||||
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
|
||||
|
||||
# add host-gettext for AM_ICONV macro
|
||||
LINKNX_DEPENDENCIES = \
|
||||
host-gettext \
|
||||
host-pkgconf \
|
||||
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 += 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