From 467eb8588b08f4beba50120ff9f312331dae47b1 Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Tue, 19 Apr 2016 09:33:22 +0200 Subject: Fix build to detect the Hurd as a Linux platform. (Closes: #821747) patch from https://patch-diff.githubusercontent.com/raw/hishamhm/htop/pull/472.patch thanks to jrtc27 --- debian/changelog | 4 ++ debian/patches/004-linux-backend-for-hurd.patch | 61 +++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 66 insertions(+) create mode 100644 debian/patches/004-linux-backend-for-hurd.patch diff --git a/debian/changelog b/debian/changelog index 40864ca..074f9f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ htop (2.0.1-2) UNRELEASED; urgency=medium + [ Graham Inggs ] * Use SOURCE_DATE_EPOCH instead of current year in copyright message. + [ Daniel Lange ] + * Fix build to detect the Hurd as a Linux platform. (Closes: #821747) + -- Graham Inggs Fri, 15 Apr 2016 18:16:59 +0200 htop (2.0.1-1) unstable; urgency=medium diff --git a/debian/patches/004-linux-backend-for-hurd.patch b/debian/patches/004-linux-backend-for-hurd.patch new file mode 100644 index 0000000..059e042 --- /dev/null +++ b/debian/patches/004-linux-backend-for-hurd.patch @@ -0,0 +1,61 @@ +Make the build system use $target_os and consider Hurd to be Linux + reg. htop_platform +Source: https://patch-diff.githubusercontent.com/raw/hishamhm/htop/pull/472.patch +From: James Clarke +Date: Mon, 18 Apr 2016 23:55:55 +0100 +Subject: [PATCH 1/2] Use $target_os instead of $target in configure.ac + +--- + configure.ac | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fa32359..8d48d68 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -26,17 +26,17 @@ AC_PROG_LIBTOOL + + # Checks for platform. + # ---------------------------------------------------------------------- +-case "$target" in +-*linux*) ++case "$target_os" in ++linux*) + my_htop_platform=linux + ;; +-*freebsd*) ++freebsd*|kfreebsd*) + my_htop_platform=freebsd + ;; +-*openbsd*) ++openbsd*) + my_htop_platform=openbsd + ;; +-*darwin*) ++darwin*) + my_htop_platform=darwin + ;; + *) + +From 2de52862a693327e9d18057b175e4a7753a492e3 Mon Sep 17 00:00:00 2001 +From: James Clarke +Date: Mon, 18 Apr 2016 23:57:30 +0100 +Subject: [PATCH 2/2] Use Linux backend on the Hurd + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 8d48d68..ccbfb52 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,7 +27,7 @@ AC_PROG_LIBTOOL + # Checks for platform. + # ---------------------------------------------------------------------- + case "$target_os" in +-linux*) ++linux*|gnu*) + my_htop_platform=linux + ;; + freebsd*|kfreebsd*) diff --git a/debian/patches/series b/debian/patches/series index c5db75a..6019310 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,5 @@ 001-lintian-warning-fix-man-typo.patch 002-lintian-warning-fix-desktop-keywords.patch 003-use-source-date-epoch.patch +004-linux-backend-for-hurd.patch 601-openvz-new-ctid-vpid.patch -- cgit v1.2.3