ncurses: 5.9 -> 6.0
Upstream claims it's API-compatible with 5.* It no longer installed *.pc until I passed pkgconfig executable; without those things were breaking, even our library symlinking.
This commit is contained in:
parent
ae154ae8ef
commit
d2dab39bfa
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
{ lib, stdenv, fetchurl, pkgconfig
|
||||
|
||||
, mouseSupport ? false
|
||||
, unicode ? true
|
||||
|
@ -6,19 +6,18 @@
|
|||
, gpm
|
||||
|
||||
# Extra Options
|
||||
, abiVersion ? "5"
|
||||
, abiVersion ? "6"
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ncurses-5.9";
|
||||
name = "ncurses-6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/ncurses/${name}.tar.gz";
|
||||
sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh";
|
||||
sha256 = "0q3jck7lna77z5r42f13c4xglc7azd19pxfrjrpgp2yf615w4lgm";
|
||||
};
|
||||
|
||||
# gcc-5.patch should be removed after 5.9
|
||||
patches = [ ./clang.patch ./gcc-5.patch ];
|
||||
patches = [ ./clang.patch ];
|
||||
|
||||
outputs = [ "dev" "out" "man" ];
|
||||
setOutputFlags = false; # some aren't supported
|
||||
|
@ -33,6 +32,7 @@ stdenv.mkDerivation rec {
|
|||
# Only the C compiler, and explicitly not C++ compiler needs this flag on solaris:
|
||||
CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm;
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
@ -1,46 +0,0 @@
|
|||
https://bugs.gentoo.org/545114
|
||||
|
||||
extracted from the upstream change (which had many unrelated commits in one)
|
||||
|
||||
From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001
|
||||
From: "Thomas E. Dickey" <dickey@invisible-island.net>
|
||||
Date: Sun, 7 Dec 2014 03:10:09 +0000
|
||||
Subject: [PATCH] ncurses 5.9 - patch 20141206
|
||||
|
||||
+ modify MKlib_gen.sh to work around change in development version of
|
||||
gcc introduced here:
|
||||
https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
|
||||
https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html
|
||||
(reports by Marcus Shawcroft, Maohui Lei).
|
||||
|
||||
diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
|
||||
index d8cc3c9..b91398c 100755
|
||||
--- a/ncurses/base/MKlib_gen.sh
|
||||
+++ b/ncurses/base/MKlib_gen.sh
|
||||
@@ -474,11 +474,22 @@ sed -n -f $ED1 \
|
||||
-e 's/gen_$//' \
|
||||
-e 's/ / /g' >>$TMP
|
||||
|
||||
+cat >$ED1 <<EOF
|
||||
+s/ / /g
|
||||
+s/^ //
|
||||
+s/ $//
|
||||
+s/P_NCURSES_BOOL/NCURSES_BOOL/g
|
||||
+EOF
|
||||
+
|
||||
+# A patch discussed here:
|
||||
+# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
|
||||
+# introduces spurious #line markers. Work around that by ignoring the system's
|
||||
+# attempt to define "bool" and using our own symbol here.
|
||||
+sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
|
||||
+cat $ED2 >$TMP
|
||||
+
|
||||
$preprocessor $TMP 2>/dev/null \
|
||||
-| sed \
|
||||
- -e 's/ / /g' \
|
||||
- -e 's/^ //' \
|
||||
- -e 's/_Bool/NCURSES_BOOL/g' \
|
||||
+| sed -f $ED1 \
|
||||
| $AWK -f $AW2 \
|
||||
| sed -f $ED3 \
|
||||
| sed \
|
Loading…
Reference in a new issue