From fe59e989719dd2a9c4fd27aa0ef156ab6f860ae559c3a6f69ec14f42053bb583 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 20 Apr 2012 04:49:24 +0000 Subject: [PATCH] Accepting request 114736 from home:msmeissn:branches:Base:System fix ppc build OBS-URL: https://build.opensuse.org/request/show/114736 OBS-URL: https://build.opensuse.org/package/show/Base:System/grep?expand=0&rev=24 --- grep-ppc-fix.patch | 21 --------------------- grep.changes | 5 +++++ grep.spec | 7 ++----- 3 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 grep-ppc-fix.patch diff --git a/grep-ppc-fix.patch b/grep-ppc-fix.patch deleted file mode 100644 index d00ef47..0000000 --- a/grep-ppc-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: grep-2.9/gnulib-tests/test-float.c -=================================================================== ---- grep-2.9.orig/gnulib-tests/test-float.c -+++ grep-2.9/gnulib-tests/test-float.c -@@ -361,16 +361,6 @@ main () - test_float (); - test_double (); - -- { -- DECL_LONG_DOUBLE_ROUNDING -- -- BEGIN_LONG_DOUBLE_ROUNDING (); -- -- test_long_double (); -- -- END_LONG_DOUBLE_ROUNDING (); -- } -- - return 0; - } - diff --git a/grep.changes b/grep.changes index da834f8..500dcac 100644 --- a/grep.changes +++ b/grep.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 19 17:43:06 CEST 2012 - meissner@suse.de + +- use -mlong-double-64 on ppc* + ------------------------------------------------------------------- Tue Mar 13 18:18:23 UTC 2012 - tabraham@novell.com diff --git a/grep.spec b/grep.spec index 5e8d807..a38ea51 100644 --- a/grep.spec +++ b/grep.spec @@ -16,7 +16,6 @@ # - Name: grep BuildRequires: automake BuildRequires: pcre-devel @@ -32,7 +31,6 @@ Summary: Print lines matching a pattern License: GPL-3.0+ Group: Productivity/Text/Utilities Source: grep-%{version}.tar.bz2 -Patch0: grep-ppc-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,12 +44,11 @@ By default, grep prints the matching lines. echo "ac_cv_search_pcre_compile=\${ac_cv_search_pcre_compile=%{_libdir}/libpcre.a}" >config.cache %endif -# If you platform Long Double and Double to not match as expected +%build %ifarch ppc ppc64 -%patch0 -p1 +export CFLAGS="$RPM_OPT_FLAGS -mlong-double-64" %endif -%build %if 0%{?suse_version} < 1120 %configure -C --bindir=/bin --disable-silent-rules --without-included-regex %else