add Boost::Atomic to link with
authorLaszlo Boszormenyi (GCS) <gcs@debian.org>
Tue, 8 Jan 2019 21:31:07 +0000 (21:31 +0000)
committerLaszlo Boszormenyi (GCS) <gcs@debian.org>
Tue, 8 Jan 2019 21:31:07 +0000 (21:31 +0000)
Last-Update: 2018-09-23

Some architectures need this explicitly.

Gbp-Pq: Name fix_boost_atomic_link.patch

compiler/cpp/Makefile.am
compiler/cpp/Makefile.in
lib/cpp/Makefile.am
lib/cpp/Makefile.in

index 482a89a4d1a6e978db40b59e5d20e471585a81cb..6ffd5c88386ca027f2cfa8145d73915bd991ef3a 100644 (file)
@@ -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) \
index d83d398d02a5e0459e65d7b8c9e63c455eceda4a..b28427f5674df4ae8f740bd0c01277c09b62e819 100644 (file)
@@ -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) \
index cd1d9234685ef2e8176c252836068a3dc85b1365..fc39a60752b933ffd5f2cabbf189447405f9f19d 100755 (executable)
@@ -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.
index 6cd835d48a9139c8722433868e1b1aeb90501d11..b83d86f604551b5273c3817e96a81653d9425b04 100644 (file)
@@ -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