summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-03-13 00:17:01 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-03-13 00:17:01 +0100
commit7688dbbdd7a7a091c9a0fc4850e70725e3ff64e3 (patch)
tree8d0632a27682970cb51c62ba4fb618db810b128f
parentedc8fd2e2d75ba7af9bf6403277ecb0dccd48dc3 (diff)
downloadguix-7688dbbdd7a7a091c9a0fc4850e70725e3ff64e3.tar.gz
gnu: ncurses: Prevent binutils reference.
This fixes a regression introduces in 717c433c46e8e9fc77b796e485092e2cccee336a
where ncurses would needlessly depend on binutils on runtime.

* gnu/packages/ncurses.scm (ncurses)[arguments]: Add "cf_cv_ld_searchpath" in
 #:configure-flags.
-rw-r--r--gnu/packages/ncurses.scm8
1 files changed, 7 insertions, 1 deletions
diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm
index 12e16b2403..52819e9665 100644
--- a/gnu/packages/ncurses.scm
+++ b/gnu/packages/ncurses.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2016 ng0 <ng0@n0.is>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
-;;; Copyright © 2017, 2019 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -184,6 +184,12 @@
               ;; around this.
               ,@(if (%current-target-system) '("--disable-stripping") '())
 
+              ;; Do not assume a default search path in ld, even if it is only to
+              ;; filter it out in ncurses-config.  Mainly because otherwise it ends
+              ;; up using the libdir from binutils, which makes little sense and
+              ;; causes an unnecessary runtime dependency.
+              "cf_cv_ld_searchpath=/no-ld-searchpath"
+
               ;; MinGW: Use term-driver created for the MinGW port.
               ,@(if (target-mingw?) '("--enable-term-driver") '()))))
          #:tests? #f                  ; no "check" target