Commit 822de4bc authored by Natanael Copa's avatar Natanael Copa
Browse files

main/ncurses: add patch for gcc5

parent 11377c9a
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ncurses
pkgver=5.9
pkgrel=3
pkgrel=4
pkgdesc="Console display library"
url="http://www.gnu.org/software/ncurses/"
arch="all"
license=MIT
depends=
source="ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"
source="ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
ncurses-5.9-gcc-5.patch
"
subpackages="$pkgname-dev $pkgname-doc $pkgname-terminfo-base:base
$pkgname-terminfo $pkgname-widec-libs:widec $pkgname-libs"
prepare() {
cd "$srcdir/$pkgname-$pkgver"
update_config_sub || return 1
for i in $source; do
case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac
done
}
build() {
......@@ -53,10 +60,10 @@ package() {
make -j1 -C ncursesw-build DESTDIR="$pkgdir" install.libs \
install.includes install.man || return 1
# Install basic terms in /etc/terminfo
for i in ansi console dumb linux rxvt screen sun vt52 vt100 vt102 \
vt200 vt220 xterm xterm-color xterm-xfree86; do
vt200 vt220 xterm xterm-color xterm-xfree86; do
local termfile=$(find "$pkgdir"/usr/share/terminfo/ -name "$i" 2>/dev/null)
local basedir=$(basename $(dirname "$termfile"))
......@@ -97,4 +104,9 @@ base() {
mv "$pkgdir"/etc/terminfo "$subpkgdir"/etc/
}
md5sums="8cb9c412e5f2d96bc6f459aa8c6282a1 ncurses-5.9.tar.gz"
md5sums="8cb9c412e5f2d96bc6f459aa8c6282a1 ncurses-5.9.tar.gz
57f4cd0cc0c0a42a5ddb2167f9546d72 ncurses-5.9-gcc-5.patch"
sha256sums="9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b ncurses-5.9.tar.gz
6d40c4841e031fbb8b1ea6691b112aabc398d23b20b4458ec0b6eb78c33af88d ncurses-5.9-gcc-5.patch"
sha512sums="d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1 ncurses-5.9.tar.gz
200388ee1e8d8f656620d067e8993f79a50ed1a6ebee41ce8bd32b2a61cbe10c93347e2604229b58299c457640b247261a4d05afe60802dd4cce80d17bc2f10c ncurses-5.9-gcc-5.patch"
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 \
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment