From 4f976fbde7fafd769af04685f7525e608507c6284ec7253036d18303ffee8c56 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 23 May 2007 14:19:37 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gmp?expand=0&rev=3 --- gmp-4.2.1-c99-fixes.diff | 41 ++++++++++++++++++++++++++++++++++++++++ gmp.changes | 5 +++++ gmp.spec | 8 ++++++-- 3 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 gmp-4.2.1-c99-fixes.diff diff --git a/gmp-4.2.1-c99-fixes.diff b/gmp-4.2.1-c99-fixes.diff new file mode 100644 index 0000000..2f3dfc0 --- /dev/null +++ b/gmp-4.2.1-c99-fixes.diff @@ -0,0 +1,41 @@ +Index: gmp-h.in +=================================================================== +--- gmp-h.in.orig 2006-04-11 20:10:15.000000000 +0200 ++++ gmp-h.in 2007-05-23 11:08:11.000000000 +0200 +@@ -24,6 +24,7 @@ MA 02110-1301, USA. */ + + #if defined (__cplusplus) + #include /* for std::istream, std::ostream, std::string */ ++#include /* for std::FILE */ + #endif + + +@@ -418,9 +419,15 @@ typedef __mpq_struct *mpq_ptr; + + /* gcc has __inline__ in all modes, including strict ansi. Give a prototype + for an inline too, so as to correctly specify "dllimport" on windows, in +- case the function is called rather than inlined. */ ++ case the function is called rather than inlined. ++ GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 ++ inline semantics, unless -fgnu89-inline is used. */ + #ifdef __GNUC__ ++#ifdef __GNUC_STDC_INLINE__ ++#define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__)) ++#else + #define __GMP_EXTERN_INLINE extern __inline__ ++#endif + #define __GMP_INLINE_PROTOTYPES 1 + #endif + +Index: tests/cxx/t-locale.cc +=================================================================== +--- tests/cxx/t-locale.cc.orig 2006-03-14 16:57:54.000000000 +0100 ++++ tests/cxx/t-locale.cc 2007-05-23 15:31:10.000000000 +0200 +@@ -20,6 +20,7 @@ the Free Software Foundation, Inc., 51 F + MA 02110-1301, USA. */ + + #include ++#include + #include + + #include "gmp.h" diff --git a/gmp.changes b/gmp.changes index 39ad0ac..cd6cc83 100644 --- a/gmp.changes +++ b/gmp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 22 12:40:44 CEST 2007 - rguenther@suse.de + +- Fix inline behavior for C99. + ------------------------------------------------------------------- Sat Jan 13 20:11:14 CET 2007 - meissner@suse.de diff --git a/gmp.spec b/gmp.spec index 0fd3a53..a5caf15 100644 --- a/gmp.spec +++ b/gmp.spec @@ -16,7 +16,7 @@ License: GNU General Public License (GPL), GNU Library General Public Lic Group: System/Libraries Autoreqprov: on Version: 4.2.1 -Release: 17 +Release: 33 Summary: The GNU MP Library URL: http://www.swox.com/gmp/ Source: ftp://prep.ai.mit.edu/pub/gnu/gmp/gmp-%{version}.tar.bz2 @@ -28,6 +28,7 @@ Patch4: %{name}-%{version}-configure-ppc.diff Patch5: %{name}-%{version}-mpz_set_d.diff Patch6: %{name}-%{version}-x86-fat.diff Patch7: %{name}-noexec.diff +Patch8: %{name}-%{version}-c99-fixes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -66,6 +67,7 @@ Authors: %patch5 %patch6 %patch7 +%patch8 %build export HOME=/tmp/ @@ -132,7 +134,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lib*.so /usr/include/* -%changelog -n gmp +%changelog +* Tue May 22 2007 - rguenther@suse.de +- Fix inline behavior for C99. * Sat Jan 13 2007 - meissner@suse.de - Mark assembler code as not needing exec stack/heap by hacking the m4 -> assembler wrapper script.