SHA256
1
0
forked from pool/grep

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
This commit is contained in:
Stephan Kulow 2012-04-20 04:49:24 +00:00 committed by Git OBS Bridge
parent 675c8879e8
commit fe59e98971
3 changed files with 7 additions and 26 deletions

View File

@ -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;
}

View File

@ -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

View File

@ -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