sys-libs/ncurses-compat/files/ncurses-5.9-gcc-5.patch
author gabriel
Tue, 13 Apr 2021 17:34:11 +0100
changeset 40 10be8f1bcd64
parent 22 9803496ddf72
permissions -rw-r--r--
Do not use git for release versions
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
22
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
     1
https://bugs.gentoo.org/545114
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
     2
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
     3
extracted from the upstream change (which had many unrelated commits in one)
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
     4
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
     5
From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
     6
From: "Thomas E. Dickey" <dickey@invisible-island.net>
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
     7
Date: Sun, 7 Dec 2014 03:10:09 +0000
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
     8
Subject: [PATCH] ncurses 5.9 - patch 20141206
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
     9
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    10
+ modify MKlib_gen.sh to work around change in development version of
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    11
  gcc introduced here:
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    12
	  https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    13
	  https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    14
  (reports by Marcus Shawcroft, Maohui Lei).
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    15
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    16
diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    17
index d8cc3c9..b91398c 100755
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    18
--- a/ncurses/base/MKlib_gen.sh
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    19
+++ b/ncurses/base/MKlib_gen.sh
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    20
@@ -474,11 +474,22 @@ sed -n -f $ED1 \
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    21
 	-e 's/gen_$//' \
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    22
 	-e 's/  / /g' >>$TMP
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    23
 
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    24
+cat >$ED1 <<EOF
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    25
+s/  / /g
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    26
+s/^ //
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    27
+s/ $//
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    28
+s/P_NCURSES_BOOL/NCURSES_BOOL/g
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    29
+EOF
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    30
+
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    31
+# A patch discussed here:
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    32
+#	https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    33
+# introduces spurious #line markers.  Work around that by ignoring the system's
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    34
+# attempt to define "bool" and using our own symbol here.
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    35
+sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    36
+cat $ED2 >$TMP
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    37
+
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    38
 $preprocessor $TMP 2>/dev/null \
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    39
-| sed \
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    40
-	-e 's/  / /g' \
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    41
-	-e 's/^ //' \
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    42
-	-e 's/_Bool/NCURSES_BOOL/g' \
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    43
+| sed -f $ED1 \
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    44
 | $AWK -f $AW2 \
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    45
 | sed -f $ED3 \
9803496ddf72 Add --with-verisoned-symbols to ncurses-compat
gabriel
parents:
diff changeset
    46
 | sed \