1From 048b9ae8f3c07be217f1738c35ab995ab6394453 Mon Sep 17 00:00:00 2001
2From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3Date: Sun, 8 Mar 2020 10:02:07 +0100
4Subject: [PATCH] src/Makefile.am: fix linking with log4cpp
5
6linknx fails to build with log4cpp because LOG4CPP_CFLAGS (which
7contains -pthread) is added to AM_CPPFLAGS (which is not used at link
8time) instead of AM_CXXFLAGS:
9
10/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
11/home/buildroot/autobuild/instance-0/output/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib/liblog4cpp.so: undefined reference to `pthread_key_create'
12
13So move LOG4CPP_CFLAGS to AM_CXXFLAGS
14
15Fixes:
16 - http://autobuild.buildroot.org/results/1863f8f27041bc15ca68e786ba3b8e4764c40574
17
18Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
19[Retrieved from:
20https://github.com/linknx/linknx/commit/048b9ae8f3c07be217f1738c35ab995ab6394453]
21---
22 src/Makefile.am | 3 ++-
23 1 file changed, 2 insertions(+), 1 deletion(-)
24
25diff --git a/src/Makefile.am b/src/Makefile.am
26index 6e0dc03b..5065c248 100644
27--- a/src/Makefile.am
28+++ b/src/Makefile.am
29@@ -6,6 +6,7 @@ else
30 B64_CFLAGS=
31 B64_LIBS=
32 endif
33-AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/ticpp $(B64_CFLAGS) $(PTH_CPPFLAGS) $(LIBCURL_CPPFLAGS) $(LOG4CPP_CFLAGS) $(LUA_CFLAGS) $(MYSQL_CFLAGS) $(ESMTP_CFLAGS)
34+AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/ticpp $(B64_CFLAGS) $(PTH_CPPFLAGS) $(LIBCURL_CPPFLAGS) $(LUA_CFLAGS) $(MYSQL_CFLAGS) $(ESMTP_CFLAGS)
35+AM_CXXFLAGS=$(LOG4CPP_CFLAGS)
36 linknx_LDADD=$(top_srcdir)/ticpp/libticpp.a $(LIBICONV) $(B64_LIBS) $(PTH_LDFLAGS) $(PTH_LIBS) $(LIBCURL) $(LOG4CPP_LIBS) $(LUA_LIBS) $(MYSQL_LIBS) $(ESMTP_LIBS) -lm
37 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
38