debian/patches: Added bts494874-gnu-kfreebsd.

This fixes a FTBFS on GNU/kFreeBSD - thanks to Petr Salinger for the patch.

Closes: #494874

diff --git a/debian/changelog b/debian/changelog
index 808c5108347b97c2f48489214edaa97d99c29578..388dfda84e77bb7bf36ca5738c32517bc16129d1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,11 +13,13 @@ rrdtool (1.3.5-1) unstable; urgency=low
     - Removed bts499349-memleaks - included upstream.
     - Removed bts499350-data-corruption - included upstream.
     - Removed typo-ruby - included upstream.
+    - Added bts494874-gnu-kfreebsd to fix a FTBFS on GNU/kFreeBSD - thanks to
+      Petr Salinger for the patch (Closes: #494874).
   * debian/rules:
     - Remove src/librrd.sym in the clean target - this file is automatically
       created during the build but not cleaned up in the upstream Makefiles.
 
- -- Sebastian Harl <sh@tokkee.org>  Sat, 20 Dec 2008 17:46:08 +0100
+ -- Sebastian Harl <sh@tokkee.org>  Sat, 20 Dec 2008 17:57:57 +0100
 
 rrdtool (1.3.1-4) unstable; urgency=high
 

diff --git a/debian/patches/bts494874-gnu-kfreebsd b/debian/patches/bts494874-gnu-kfreebsd
new file mode 100644 (file)
index 0000000..0ac6e18
--- /dev/null
+++ b/debian/patches/bts494874-gnu-kfreebsd
@@ -0,0 +1,24 @@
+diff a/acinclude.m4 b/acinclude.m4
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -289,7 +289,7 @@ if test "x$acx_pthread_ok" = xyes; then
+         case "${host_cpu}-${host_os}" in
+             *-aix* | *-freebsd* | *-darwin*) x_rflag="-D_THREAD_SAFE";;
+             *solaris* | *-osf* | *-hpux*) x_rflag="-D_REENTRANT";;
+-            *-linux*)
++            *-linux*|*-k*bsd*-gnu*|*-gnu*)
+             if test x"$PTHREAD_CFLAGS" = "x-pthread"; then
+                 # For Linux/gcc "-pthread" implies "-lpthread". We need, however, to make this explicit
+                 # in PTHREAD_LIBS such that a shared library to be built properly depends on libpthread.
+diff a/configure b/configure
+--- a/configure
++++ b/configure
+@@ -28428,7 +28428,7 @@ echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_
+         case "${host_cpu}-${host_os}" in
+             *-aix* | *-freebsd* | *-darwin*) x_rflag="-D_THREAD_SAFE";;
+             *solaris* | *-osf* | *-hpux*) x_rflag="-D_REENTRANT";;
+-            *-linux*)
++            *-linux*|*-k*bsd*-gnu*|*-gnu*)
+             if test x"$PTHREAD_CFLAGS" = "x-pthread"; then
+                 # For Linux/gcc "-pthread" implies "-lpthread". We need, however, to make this explicit
+                 # in PTHREAD_LIBS such that a shared library to be built properly depends on libpthread.

diff --git a/debian/patches/series b/debian/patches/series
index 69cecaaf69d7d1e3dd0691a382f19e6017caaff2..40e94c0706d333b64cb322e5f0f64b05e1a686dc 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+bts494874-gnu-kfreebsd
 bts428778-floating-point-exception
 setup.py-module-name
 no-rpath-for-ruby