Accepting request 261998 from home:Andreas_Schwab:Factory

- Make gmp-noexec.diff compatible with arm
- Use correct version number

OBS-URL: https://build.opensuse.org/request/show/261998
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gmp?expand=0&rev=59
This commit is contained in:
Richard Biener 2014-11-17 11:10:18 +00:00 committed by Git OBS Bridge
parent 9e607a116b
commit f8f5bda8fd
3 changed files with 18 additions and 16 deletions

View File

@ -1,15 +1,13 @@
--- mpn/m4-ccas.xx 2007-01-13 19:33:32.000000000 +0100
+++ mpn/m4-ccas 2007-01-13 19:34:19.000000000 +0100
@@ -88,8 +88,11 @@
CC="$CC -o $BASENAME.o"
fi
+echo '.section .note.GNU-stack,"",@progbits' > $TMP
+echo '.previous' >> $TMP
+
Index: mpn/m4-ccas
===================================================================
--- mpn/m4-ccas.orig
+++ mpn/m4-ccas
@@ -100,6 +100,8 @@ fi
echo "$M4 $DEFS $ASM >$TMP"
-$M4 $DEFS $ASM >$TMP || exit
+$M4 $DEFS $ASM >>$TMP || exit
$M4 $DEFS $ASM >$TMP || exit
+echo '.section .note.GNU-stack,"",%progbits' >> $TMP
+
echo "$CC"
$CC || exit

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Nov 17 08:29:15 UTC 2014 - schwab@suse.de
- Make gmp-noexec.diff compatible with arm
- Use correct version number
-------------------------------------------------------------------
Fri Nov 7 00:41:24 UTC 2014 - afaerber@suse.de

View File

@ -22,13 +22,13 @@ BuildRequires: gcc-c++
%ifarch ppc64
Obsoletes: gmp-64bit
%endif
Version: 6.0.0a
Version: 6.0.0
Release: 0
Summary: The GNU MP Library
License: GPL-3.0+ and LGPL-3.0+
Group: System/Libraries
Url: http://gmplib.org/
Source: ftp://ftp.gmplib.org/pub/%{name}/%{name}-%{version}.tar.bz2
Source: ftp://ftp.gmplib.org/pub/%{name}/%{name}-%{version}a.tar.bz2
Source2: baselibs.conf
Patch0: gmp-noexec.diff
Patch1: gmp-6.0.0-ppc64-gcd.diff
@ -72,11 +72,9 @@ huge numbers (integer and floating point).
%prep
%setup -q -n %{name}-6.0.0
%ifnarch %arm
%setup -q
%patch0
%patch1 -p1
%endif
%build
export CFLAGS="$RPM_OPT_FLAGS -fexceptions"