[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: gnu: ncurses: Do not use "install -s" when cross-compiling.
|
From: |
Ludovic Courtès |
|
Subject: |
02/03: gnu: ncurses: Do not use "install -s" when cross-compiling. |
|
Date: |
Sun, 22 Apr 2018 16:41:21 -0400 (EDT) |
civodul pushed a commit to branch core-updates
in repository guix.
commit b0ff3606be036ee03f9680285dc167da5ee07e00
Author: Ludovic Courtès <address@hidden>
Date: Sun Apr 22 22:37:52 2018 +0200
gnu: ncurses: Do not use "install -s" when cross-compiling.
Reported by Marius Bakke <address@hidden>
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.
---
gnu/packages/ncurses.scm | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm
index daa146b..2f628a6 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 <address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2018 Ludovic Courtès
<address@hidden>
;;; Copyright © 2014, 2016 Mark H Weaver <address@hidden>
;;; Copyright © 2015, 2017 Leo Famulari <address@hidden>
;;; Copyright © 2016 Nils Gillmann <address@hidden>
@@ -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