← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to debian/patches/libboost-thread.patch

  • Committer: Package Import Robot
  • Author(s): Dmitrijs Ledkovs
  • Date: 2013-10-29 15:43:40 UTC
  • mfrom: (1.2.12) (2.1.19 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20131029154340-2gp39el6cv8bwf2o
Tags: 1:7.2.3-2ubuntu1
* Merge from debian, remaining changes:
  - Link against boost_system because of boost_thread.
  - Add required libs to message/include.am
  - Add upstart job and adjust init script to be upstart compatible.
  - Disable -floop-parallelize-all due to gcc-4.8/4.9 compiler ICE
    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57732

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/libboost-thread.patch
1
 
Description: link boost system
2
 
Author: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
3
 
 
4
 
--- drizzle-7.1.36-stable.orig/m4/pandora_have_libboost_thread.m4
5
 
+++ drizzle-7.1.36-stable/m4/pandora_have_libboost_thread.m4
6
 
@@ -17,13 +17,13 @@ AC_DEFUN([_PANDORA_SEARCH_BOOST_THREAD],
7
 
   CXXFLAGS="${PTHREAD_CFLAGS} ${CXXFLAGS}"
8
 
 
9
 
   AC_LANG_PUSH(C++)
10
 
-  AC_LIB_HAVE_LINKFLAGS(boost_thread-mt,,[
11
 
+  AC_LIB_HAVE_LINKFLAGS(boost_thread-mt,boost_system-mt,[
12
 
     #include <boost/thread.hpp>
13
 
   ],[
14
 
     boost::thread id;
15
 
   ])
16
 
   AS_IF([test "x${ac_cv_libboost_thread_mt}" = "xno"],[
17
 
-    AC_LIB_HAVE_LINKFLAGS(boost_thread,,[
18
 
+    AC_LIB_HAVE_LINKFLAGS(boost_thread,boost_system,[
19
 
       #include <boost/thread.hpp>
20
 
     ],[
21
 
       boost::thread id;