0003-src-Makefile.am-fix-linking-with-log4cpp.patch 2.6 KB

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