From: Laszlo Boszormenyi (GCS) Date: Tue, 8 Jan 2019 21:31:07 +0000 (+0000) Subject: add Boost::Atomic to link with X-Git-Tag: archive/raspbian/0.13.0-6+rpi1~1^2^2~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5f3a99e4dee1a7598932388ccab06251f83bce8c;p=thrift.git add Boost::Atomic to link with Last-Update: 2018-09-23 Some architectures need this explicitly. Gbp-Pq: Name fix_boost_atomic_link.patch --- diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am index 482a89a..6ffd5c8 100644 --- a/compiler/cpp/Makefile.am +++ b/compiler/cpp/Makefile.am @@ -122,6 +122,7 @@ lib_LTLIBRARIES = libthriftc.la thrift_CPPFLAGS += -DTHRIFT_ENABLE_PLUGIN=1 thrift_LDADD += libthriftc.la +thrift_LDADD += -lboost_atomic nodist_libthriftc_la_SOURCES = $(plugin_gen) libthriftc_la_SOURCES = $(compiler_core) \ diff --git a/compiler/cpp/Makefile.in b/compiler/cpp/Makefile.in index d83d398..b28427f 100644 --- a/compiler/cpp/Makefile.in +++ b/compiler/cpp/Makefile.in @@ -818,6 +818,7 @@ thrift_SOURCES = src/thrift/main.h src/thrift/main.cc \ thrift_CPPFLAGS = -I$(srcdir)/src $(am__append_3) thrift_CXXFLAGS = -Wall -Wextra -pedantic -Werror thrift_LDADD = @LEXLIB@ src/thrift/libparse.a $(am__append_4) +thrift_LDADD += -lboost_atomic @WITH_PLUGIN_TRUE@lib_LTLIBRARIES = libthriftc.la @WITH_PLUGIN_TRUE@nodist_libthriftc_la_SOURCES = $(plugin_gen) @WITH_PLUGIN_TRUE@libthriftc_la_SOURCES = $(compiler_core) \ diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am index cd1d923..fc39a60 100755 --- a/lib/cpp/Makefile.am +++ b/lib/cpp/Makefile.am @@ -40,7 +40,7 @@ pkgconfigdir = $(libdir)/pkgconfig lib_LTLIBRARIES = libthrift.la pkgconfig_DATA = thrift.pc libthrift_la_LDFLAGS = -release $(VERSION) -libthrift_la_LIBADD = $(BOOST_LDFLAGS) $(OPENSSL_LDFLAGS) $(OPENSSL_LIBS) +libthrift_la_LIBADD = $(BOOST_LDFLAGS) $(OPENSSL_LDFLAGS) $(OPENSSL_LIBS) -lboost_atomic ## We only build the extra libraries if we have the dependencies, ## but we install all of the headers unconditionally. diff --git a/lib/cpp/Makefile.in b/lib/cpp/Makefile.in index 6cd835d..b83d86f 100644 --- a/lib/cpp/Makefile.in +++ b/lib/cpp/Makefile.in @@ -736,7 +736,7 @@ lib_LTLIBRARIES = libthrift.la $(am__append_2) $(am__append_4) \ pkgconfig_DATA = thrift.pc $(am__append_3) $(am__append_5) \ $(am__append_7) $(am__append_9) libthrift_la_LDFLAGS = -release $(VERSION) -libthrift_la_LIBADD = $(BOOST_LDFLAGS) $(OPENSSL_LDFLAGS) $(OPENSSL_LIBS) +libthrift_la_LIBADD = $(BOOST_LDFLAGS) $(OPENSSL_LDFLAGS) $(OPENSSL_LIBS) -lboost_atomic AM_CXXFLAGS = -Wall -Wextra -pedantic AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(OPENSSL_INCLUDES) -I$(srcdir)/src -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS