aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraham Inggs <ginggs@debian.org>2018-02-17 19:42:51 +0200
committerGraham Inggs <ginggs@debian.org>2018-02-17 19:42:51 +0200
commitfc2f6225822b180eb2714cc9cc7d1933adedb223 (patch)
tree24a2bed25d79bf401d9a2fc35e456f7ad499309e
parent3246f46de6879f1c2a0fd056bccda1a4a0400388 (diff)
downloaddebian_htop-fc2f6225822b180eb2714cc9cc7d1933adedb223.tar.gz
debian_htop-fc2f6225822b180eb2714cc9cc7d1933adedb223.tar.bz2
debian_htop-fc2f6225822b180eb2714cc9cc7d1933adedb223.zip
Fix preservation of LDFLAGS value during configure script
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/fix-ldflags.patch17
-rw-r--r--debian/patches/series1
3 files changed, 19 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 1b36053..a9ab1be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ htop (2.1.0-3) UNRELEASED; urgency=medium
* Add debian/clean to remove autogenerated headers
* Refresh debian/patches/601-openvz-new-ctid-vpid.patch
* Fix issue with small terminals (Closes: #889693)
+ * Fix preservation of LDFLAGS value during configure script
-- Graham Inggs <ginggs@debian.org> Mon, 05 Feb 2018 18:07:57 +0000
diff --git a/debian/patches/fix-ldflags.patch b/debian/patches/fix-ldflags.patch
new file mode 100644
index 0000000..5e27815
--- /dev/null
+++ b/debian/patches/fix-ldflags.patch
@@ -0,0 +1,17 @@
+Description: Fix preservation of LDFLAGS value during configure script
+Bug: https://github.com/hishamhm/htop/issues/738
+Origin: upstream,https://github.com/hishamhm/htop/commit/df9922a67eb8e02ab4cf1ff8f24b40f14094e699
+Author: Hisham Muhammad <hisham@gobolinux.org>
+Last-Update: 2018-02-17
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -167,7 +167,7 @@
+ LIBS="$htop_config_script $LIBS "
+ htop_script_success=yes
+ ], [])
+- LDFLAGS="$save_LDFLAGS"
++ LDFLAGS="$htop_save_LDFLAGS"
+ fi
+ if test "x$htop_script_success" = xno; then
+ [$5]
diff --git a/debian/patches/series b/debian/patches/series
index 7b9311f..2320e6a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
601-openvz-new-ctid-vpid.patch
fix-small-terminals.patch
+fix-ldflags.patch

© 2014-2024 Faster IT GmbH | imprint | privacy policy