1*4882a593SmuzhiyunFrom 048b9ae8f3c07be217f1738c35ab995ab6394453 Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3*4882a593SmuzhiyunDate: Sun, 8 Mar 2020 10:02:07 +0100
4*4882a593SmuzhiyunSubject: [PATCH] src/Makefile.am: fix linking with log4cpp
5*4882a593Smuzhiyun
6*4882a593Smuzhiyunlinknx fails to build with log4cpp because LOG4CPP_CFLAGS (which
7*4882a593Smuzhiyuncontains -pthread) is added to AM_CPPFLAGS (which is not used at link
8*4882a593Smuzhiyuntime) instead of AM_CXXFLAGS:
9*4882a593Smuzhiyun
10*4882a593Smuzhiyun/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*4882a593Smuzhiyun/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*4882a593Smuzhiyun
13*4882a593SmuzhiyunSo move LOG4CPP_CFLAGS to AM_CXXFLAGS
14*4882a593Smuzhiyun
15*4882a593SmuzhiyunFixes:
16*4882a593Smuzhiyun - http://autobuild.buildroot.org/results/1863f8f27041bc15ca68e786ba3b8e4764c40574
17*4882a593Smuzhiyun
18*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
19*4882a593Smuzhiyun[Retrieved from:
20*4882a593Smuzhiyunhttps://github.com/linknx/linknx/commit/048b9ae8f3c07be217f1738c35ab995ab6394453]
21*4882a593Smuzhiyun---
22*4882a593Smuzhiyun src/Makefile.am | 3 ++-
23*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 1 deletion(-)
24*4882a593Smuzhiyun
25*4882a593Smuzhiyundiff --git a/src/Makefile.am b/src/Makefile.am
26*4882a593Smuzhiyunindex 6e0dc03b..5065c248 100644
27*4882a593Smuzhiyun--- a/src/Makefile.am
28*4882a593Smuzhiyun+++ b/src/Makefile.am
29*4882a593Smuzhiyun@@ -6,6 +6,7 @@ else
30*4882a593Smuzhiyun B64_CFLAGS=
31*4882a593Smuzhiyun B64_LIBS=
32*4882a593Smuzhiyun endif
33*4882a593Smuzhiyun-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*4882a593Smuzhiyun+AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/ticpp $(B64_CFLAGS) $(PTH_CPPFLAGS) $(LIBCURL_CPPFLAGS) $(LUA_CFLAGS) $(MYSQL_CFLAGS) $(ESMTP_CFLAGS)
35*4882a593Smuzhiyun+AM_CXXFLAGS=$(LOG4CPP_CFLAGS)
36*4882a593Smuzhiyun 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*4882a593Smuzhiyun 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