rpm/ncurses
SHA256
1
0
Fork 0
forked from pool/ncurses
Code Pull Requests Activity

Accepting request 333695 from home:michel_mno:branches:Base:System

Browse Source 
- New patch to avoid ppc64 build error, related to bnc#946048
  ncurses-6.0-wildcard_for_ppc64.patch

OBS-URL: https://build.opensuse.org/request/show/333695
OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=218
This commit is contained in:
Marcus Meissner 2015-09-27 10:45:56 +00:00 committed by Git OBS Bridge
parent 546355776e
commit a4b858ef75
3 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ncurses-6.0-wildcard_for_ppc64.patch Normal file
View File

@ -0,0 +1,47 @@
From: Michel Normand <normand@linux.vnet.ibm.com>
Subject: ncurses 6.0 wildcard for ppc64
Date: Fri, 25 Sep 2015 11:23:32 +0200
related to bug openSUSE 946048
avoid ncurses build error on ppc64 architecture
the nm tool is reporting _is_missing in Data section for ppc64.
(by comparison ppc64le is reporting it in Text section)
===
[ 102s] /usr/lib64/gcc/powerpc64-suse-linux/5/../../../../powerpc64-suse-linux/bin/ld:resulting.map:113: syntax error in VERSION script
[ 102s] collect2: error: ld returned 1 exit status
===
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
---
aclocal.m4 | 3 ++-
configure | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
Index: ncurses-6.0/aclocal.m4
===================================================================
--- ncurses-6.0.orig/aclocal.m4
+++ ncurses-6.0/aclocal.m4
@@ -7625,7 +7625,8 @@ EOF
if make -f conftest.mk 2>&AC_FD_CC >/dev/null
then
# test for missing symbol
- cf_missing=`nm -P conftest.so 2>&AC_FD_CC |fgrep _ismissing | egrep '[[ ]]T[[ ]]'`
+ # could be either Data or Text section
+ cf_missing=`nm -P conftest.so 2>&AC_FD_CC |fgrep _ismissing | egrep '[[ ]][DT][[ ]]'`
test -n "$cf_missing" && WILDCARD_SYMS=yes
fi
AC_MSG_RESULT($WILDCARD_SYMS)
Index: ncurses-6.0/configure
===================================================================
--- ncurses-6.0.orig/configure
+++ ncurses-6.0/configure
@@ -6660,7 +6660,8 @@ EOF
if make -f conftest.mk 2>&5 >/dev/null
then
# test for missing symbol
- cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ ]T[ ]'`
+ # could be either Data or Text section
+ cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ ][DT][ ]'`
test -n "$cf_missing" && WILDCARD_SYMS=yes
fi
echo "$as_me:6666: result: $WILDCARD_SYMS" >&5

6
ncurses.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Sep 25 09:42:43 UTC 2015 - normand@linux.vnet.ibm.com
- New patch to avoid ppc64 build error, related to bnc#946048
ncurses-6.0-wildcard_for_ppc64.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 14 08:02:36 UTC 2015 - werner@suse.de Mon Sep 14 08:02:36 UTC 2015 - werner@suse.de

2
ncurses.spec
View File

@ -64,6 +64,7 @@ Patch3: ncurses-5.9-overwrite.dif
Patch4: ncurses-5.7-tack.dif Patch4: ncurses-5.7-tack.dif
Patch5: ncurses-5.9-environment.dif Patch5: ncurses-5.9-environment.dif
Patch6: ncurses-6.0-avoid-line-markers.dif Patch6: ncurses-6.0-avoid-line-markers.dif
Patch7: ncurses-6.0-wildcard_for_ppc64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc %global _sysconfdir /etc
%global _miscdir %{_datadir}/misc %global _miscdir %{_datadir}/misc
@ -283,6 +284,7 @@ mv tack-* tack
%patch -P 5 -p0 -b .lc %patch -P 5 -p0 -b .lc
%patch -P 0 -p0 -b .p0 %patch -P 0 -p0 -b .p0
%patch -P 6 -p0 -b .p6 %patch -P 6 -p0 -b .p6
%patch -P 7 -p1 -b .p7
rm -vf include/ncurses_dll.h rm -vf include/ncurses_dll.h
rm -vf mkdirs.sh rm -vf mkdirs.sh
rm -vf tar-copy.sh rm -vf tar-copy.sh