diff options
| author | Daniel Lange <DLange@git.local> | 2021-01-17 18:07:08 +0100 |
|---|---|---|
| committer | Daniel Lange <DLange@git.local> | 2021-01-17 19:10:35 +0100 |
| commit | 3985adac5b6b886f3225ee6fb8cba838d1a84b15 (patch) | |
| tree | 776dbf9d4b92c718a58275b4c52a9836f23cf169 | |
| parent | 46b17a1d917b759bfd0df83490d0a9cc1d01a364 (diff) | |
| download | debian_htop-3985adac5b6b886f3225ee6fb8cba838d1a84b15.tar.gz debian_htop-3985adac5b6b886f3225ee6fb8cba838d1a84b15.tar.bz2 debian_htop-3985adac5b6b886f3225ee6fb8cba838d1a84b15.zip | |
Fix hurd build to actually find /proc(/) and disable sensors for that platform
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rwxr-xr-x | debian/rules | 8 |
3 files changed, 13 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 15379f4..0a8ee87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ htop (3.0.5-3) UNRELEASED; urgency=medium * Another update to the hurd patch + * Fix PROCDIR for the hurd build + * Disable sensors for hurd build (no libsensors-dev available) - -- Daniel Lange <DLange@debian.org> Fri, 15 Jan 2021 10:47:00 +0100 + -- Daniel Lange <DLange@debian.org> Sun, 17 Jan 2021 19:00:00 +0100 htop (3.0.5-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index 90f3af5..1ae2c69 100644 --- a/debian/control +++ b/debian/control @@ -11,9 +11,9 @@ Build-Depends: debhelper-compat (= 13), libkvm-dev [kfreebsd-any], libncurses5-dev, libncursesw5-dev, - libnl-3-dev [linux-any], - libnl-genl-3-dev [linux-any], - libsensors4-dev, + libnl-3-dev [linux-any], + libnl-genl-3-dev [linux-any], + libsensors4-dev [!hurd-any], pkg-config Standards-Version: 4.5.1 Rules-Requires-Root: no diff --git a/debian/rules b/debian/rules index e561e98..0d95754 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,13 @@ else --enable-hwloc endif +# hurd-i386 can open /proc (nothing there) and /proc/ which works +ifeq (hurd-i386,$(DEB_TARGET_ARCH)) + ARCH_DEPENDENT_CONFIGURE_PARAMS+= --with-proc=/proc/ +else + ARCH_DEPENDENT_CONFIGURE_PARAMS+= --with-sensors +endif + %: dh $@ @@ -23,5 +30,4 @@ override_dh_auto_configure: --enable-vserver \ --enable-cgroup \ --enable-unicode \ - --with-sensors \ $(ARCH_DEPENDENT_CONFIGURE_PARAMS) |