Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ccaacf617aedc4af112aedfd2ef46904ed563588)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ccaacf617aedc4af112aedfd2ef46904ed563588)
  • Date: Sat, 25 Apr 2015 16:04:27 -0500

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

libs/ncurses/HISTORY | 4 ++
libs/ncurses/PRE_BUILD | 5 ++
libs/ncurses/ncurses-5.9-gcc5_buildfixes-1.patch | 39
+++++++++++++++++++++++
3 files changed, 47 insertions(+), 1 deletion(-)

New commits:
commit ccaacf617aedc4af112aedfd2ef46904ed563588
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

libs/ncurses: added a gcc 5.1 fix

diff --git a/libs/ncurses/HISTORY b/libs/ncurses/HISTORY
index e36c75d..2ed4e4a 100644
--- a/libs/ncurses/HISTORY
+++ b/libs/ncurses/HISTORY
@@ -1,3 +1,7 @@
+2015-04-25 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD, ncurses-5.9-gcc5_buildfixes-1.patch: added a patch
+ from LFS project to fix building with gcc 5.1
+
2014-05-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* INSTALL: create libtinfo symlink

diff --git a/libs/ncurses/PRE_BUILD b/libs/ncurses/PRE_BUILD
index fcd278e..ac464c4 100755
--- a/libs/ncurses/PRE_BUILD
+++ b/libs/ncurses/PRE_BUILD
@@ -3,4 +3,7 @@ cd "$SOURCE_DIRECTORY" &&

# don't nuke the terminfo database #13731
sed -i '/rm -rf $(DESTDIR)$(ticdir)/d' "$SOURCE_DIRECTORY/misc/Makefile.in"
&&
-sed -i '/rm -fr ?/d' "$SOURCE_DIRECTORY/misc/run_tic.in"
+sed -i '/rm -fr ?/d' "$SOURCE_DIRECTORY/misc/run_tic.in" &&
+
+# gcc 5.1 fix
+patch -p1 < $SCRIPT_DIRECTORY/ncurses-5.9-gcc5_buildfixes-1.patch
diff --git a/libs/ncurses/ncurses-5.9-gcc5_buildfixes-1.patch
b/libs/ncurses/ncurses-5.9-gcc5_buildfixes-1.patch
new file mode 100644
index 0000000..be64931
--- /dev/null
+++ b/libs/ncurses/ncurses-5.9-gcc5_buildfixes-1.patch
@@ -0,0 +1,39 @@
+Submitted By: Douglas R. Reno <renodr2002 AT gmail.com>
+Date: 2015-04-15
+Initial Package Version: 5.9
+Upstream Status: Unknown
+Origin:
ftp://invisible-island.net/ncurses/5.9/ncurses-5.9-20141206.patch.gz
+Description: Fixes a compilation issue with GCC 5.1. Note
that this patch was trimmed from the above patch.
+
+Index: ncurses-5.9/ncurses/base/MKlib_gen.sh
+===========================================================================================
+
+--- ncurses-5.9-20141129+/ncurses/base/MKlib_gen.sh 2011-06-04
19:14:08.000000000 +0000
++++ ncurses-5.9-20141206/ncurses/base/MKlib_gen.sh 2014-12-06
18:56:25.000000000 +0000
+@@ -474,11 +474,22 @@
+ -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 \



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ccaacf617aedc4af112aedfd2ef46904ed563588), Pavel Vinogradov, 04/25/2015

Archive powered by MHonArc 2.6.24.

Top of Page