From 23a194b2c8a610f84e1492aa7917705fac4f8f80f864019ee8d81b897aeaf3e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Sat, 29 Oct 2011 18:54:23 +0000 Subject: [PATCH] Accepting request 89734 from home:msmeissn:branches:Base:System fixed ppc build OBS-URL: https://build.opensuse.org/request/show/89734 OBS-URL: https://build.opensuse.org/package/show/Base:System/grep?expand=0&rev=15 --- grep-ppc-fix.patch | 21 +++++++++++++++++++++ grep.changes | 6 ++++++ grep.spec | 6 ++++++ 3 files changed, 33 insertions(+) create mode 100644 grep-ppc-fix.patch diff --git a/grep-ppc-fix.patch b/grep-ppc-fix.patch new file mode 100644 index 0000000..d00ef47 --- /dev/null +++ b/grep-ppc-fix.patch @@ -0,0 +1,21 @@ +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 fe403fe..2c4dcf6 100644 --- a/grep.changes +++ b/grep.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Oct 29 14:09:48 UTC 2011 - meissner@suse.com + +- disable the long double checks on ppc* as they dont meet + the preconditions in their double vs long double usage. + ------------------------------------------------------------------- Tue Sep 27 12:42:54 CEST 2011 - dmueller@suse.de diff --git a/grep.spec b/grep.spec index 4f9f4f5..280e79e 100644 --- a/grep.spec +++ b/grep.spec @@ -33,6 +33,7 @@ Release: 1 Summary: Print lines matching a pattern Source: grep-%{version}.tar.bz2 Patch0: fix-testsuite.diff +Patch1: grep-ppc-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -47,6 +48,11 @@ echo "ac_cv_search_pcre_compile=\${ac_cv_search_pcre_compile=%{_libdir}/libpcre. %endif %patch0 +# If you platform Long Double and Double to not match as expected +%ifarch ppc ppc64 +%patch1 -p1 +%endif + %build %if 0%{?suse_version} < 1120 %configure -C --bindir=/bin --disable-silent-rules --without-included-regex