From 73a3213f893eff0b2a5938f8df0967391d11cc47 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 15 Jun 2015 19:15:59 +0000 Subject: [PATCH] Fix build failure on kFreeBSD due to undeclared '__FreeBSD_version', thanks Steven Chamberlain for the patch. Closes: #788709 --- debian/changelog | 7 +++++++ debian/patches/04_kfreebsd_version.patch | 21 +++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 29 insertions(+) create mode 100644 debian/patches/04_kfreebsd_version.patch diff --git a/debian/changelog b/debian/changelog index 6f3cc0c6..93c69ea9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libgtop2 (2.30.0-2) UNRELEASED; urgency=medium + + * Fix build failure on kFreeBSD due to undeclared '__FreeBSD_version', + thanks Steven Chamberlain for the patch. Closes: #788709 + + -- Michael Biebl Mon, 15 Jun 2015 21:14:43 +0200 + libgtop2 (2.30.0-1) experimental; urgency=medium [ Jackson Doak ] diff --git a/debian/patches/04_kfreebsd_version.patch b/debian/patches/04_kfreebsd_version.patch new file mode 100644 index 00000000..9d294bc5 --- /dev/null +++ b/debian/patches/04_kfreebsd_version.patch @@ -0,0 +1,21 @@ +From: Steven Chamberlain +Date: Mon, 15 Jun 2015 17:09:49 +0100 + +Support GNU/kFreeBSD by using __FreeBSD_kernel_version here, +rather than simply __FreeBSD_version (which is only defined in +FreeBSD itself). + +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788709 +--- a/sysdeps/freebsd/open.c ++++ b/sysdeps/freebsd/open.c +@@ -43,6 +43,10 @@ + server->real_ncpu = ncpus - 1; + server->ncpu = MIN(GLIBTOP_NCPU - 1, server->real_ncpu); + ++#if defined(__FreeBSD__) + server->os_version_code = __FreeBSD_version; ++#else ++ server->os_version_code = __FreeBSD_kernel_version; ++#endif + + } diff --git a/debian/patches/series b/debian/patches/series index 6560c681..7225db44 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 02_hurd_stub_backend.patch 03_kfreebsd_installdirs.patch +04_kfreebsd_version.patch