summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-04-22 22:37:52 +0200
committerLudovic Courtès <ludo@gnu.org>2018-04-22 22:40:48 +0200
commitb0ff3606be036ee03f9680285dc167da5ee07e00 (patch)
treeb5ea8c78313654f6c701c965ee6f2c9616dc96ac
parentd3878d3d5152af371e572cd38f08414b3ba82abc (diff)
downloadpatches-b0ff3606be036ee03f9680285dc167da5ee07e00.tar
patches-b0ff3606be036ee03f9680285dc167da5ee07e00.tar.gz
gnu: ncurses: Do not use "install -s" when cross-compiling.
Reported by Marius Bakke <mbakke@fastmail.com> at <https://lists.gnu.org/archive/html/guix-devel/2018-04/msg00157.html>. * gnu/packages/ncurses.scm (ncurses)[arguments]: Add "--disable-stripping" to #:configure-flags when cross-compiling.
-rw-r--r--gnu/packages/ncurses.scm9
1 files changed, 8 insertions, 1 deletions
diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm
index daa146b217..2f628a6fe9 100644
--- a/gnu/packages/ncurses.scm
+++ b/gnu/packages/ncurses.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Nils Gillmann <ng0@n0.is>
@@ -178,6 +178,13 @@
;; correct RUNPATH.
,(list 'unquote '(string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out")
"/lib"))
+
+ ;; Starting from ncurses 6.1, "make install" runs "install -s"
+ ;; by default, which doesn't work for cross-compiled binaries
+ ;; because it invokes 'strip' instead of 'TRIPLET-strip'. Work
+ ;; around this.
+ ,@(if (%current-target-system) '("--disable-stripping") '())
+
;; MinGW: Use term-driver created for the MinGW port.
,@(if (target-mingw?) '("--enable-term-driver") '()))))
#:tests? #f ; no "check" target