From 07feaf84a403a67dc04b11c9258c6a25fdb96729 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sat, 20 Dec 2008 17:58:37 +0100 Subject: [PATCH] debian/patches: Added bts494874-gnu-kfreebsd. This fixes a FTBFS on GNU/kFreeBSD - thanks to Petr Salinger for the patch. Closes: #494874 --- debian/changelog | 4 +++- debian/patches/bts494874-gnu-kfreebsd | 24 ++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 debian/patches/bts494874-gnu-kfreebsd diff --git a/debian/changelog b/debian/changelog index 808c510..388dfda 100644 --- 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 Sat, 20 Dec 2008 17:46:08 +0100 + -- Sebastian Harl 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 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 69cecaa..40e94c0 100644 --- 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 -- 2.30.2