From f8f5bda8fd805bd0ca525fdb10ebae343c9945754fc6033d4e0af1cb6037d182 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 17 Nov 2014 11:10:18 +0000 Subject: [PATCH] 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 --- gmp-noexec.diff | 20 +++++++++----------- gmp.changes | 6 ++++++ gmp.spec | 8 +++----- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/gmp-noexec.diff b/gmp-noexec.diff index ee6a9d1..2d08f20 100644 --- a/gmp-noexec.diff +++ b/gmp-noexec.diff @@ -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 + diff --git a/gmp.changes b/gmp.changes index 203f31e..b489eb3 100644 --- a/gmp.changes +++ b/gmp.changes @@ -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 diff --git a/gmp.spec b/gmp.spec index fd98e61..af3942e 100644 --- a/gmp.spec +++ b/gmp.spec @@ -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"