← Back to branch summary

~ubuntu-branches/ubuntu/maverick/rrdtool/maverick

« back to all changes in this revision

Viewing changes to debian/patches/bts494874-gnu-kfreebsd

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2010-07-22 08:07:01 UTC
  • mfrom: (1.2.8 upstream) (3.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100722080701-k46mgdfz6euxwqsm
Tags: 1.4.3-1ubuntu1
* Merge from debian unstable, Remaining changes:
  - debian/control: Don't build against ruby1.9 as we don't want
    it in main.
* require libdbi >= 0.8.3 to prevent aborts when using dbi datasources

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/bts494874-gnu-kfreebsd
1
 
diff a/acinclude.m4 b/acinclude.m4
2
 
--- a/acinclude.m4
3
 
+++ b/acinclude.m4
4
 
@@ -289,7 +289,7 @@ if test "x$acx_pthread_ok" = xyes; then
5
 
         case "${host_cpu}-${host_os}" in
6
 
             *-aix* | *-freebsd* | *-darwin*) x_rflag="-D_THREAD_SAFE";;
7
 
             *solaris* | *-osf* | *-hpux*) x_rflag="-D_REENTRANT";;
8
 
-            *-linux*)
9
 
+            *-linux*|*-k*bsd*-gnu*|*-gnu*)
10
 
             if test x"$PTHREAD_CFLAGS" = "x-pthread"; then
11
 
                 # For Linux/gcc "-pthread" implies "-lpthread". We need, however, to make this explicit
12
 
                 # in PTHREAD_LIBS such that a shared library to be built properly depends on libpthread.
13
 
diff a/configure b/configure
14
 
--- a/configure
15
 
+++ b/configure
16
 
@@ -28428,7 +28428,7 @@ echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_
17
 
         case "${host_cpu}-${host_os}" in
18
 
             *-aix* | *-freebsd* | *-darwin*) x_rflag="-D_THREAD_SAFE";;
19
 
             *solaris* | *-osf* | *-hpux*) x_rflag="-D_REENTRANT";;
20
 
-            *-linux*)
21
 
+            *-linux*|*-k*bsd*-gnu*|*-gnu*)
22
 
             if test x"$PTHREAD_CFLAGS" = "x-pthread"; then
23
 
                 # For Linux/gcc "-pthread" implies "-lpthread". We need, however, to make this explicit
24
 
                 # in PTHREAD_LIBS such that a shared library to be built properly depends on libpthread.