Attachment 916189 Details for Bug 1116767 – arm.patch

arm.patch

arm.patch (text/plain), 1.10 KB, created by Richard W.M. Jones on 2014-07-07 20:32:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Richard W.M. Jones

Created: 2014-07-07 20:32:19 UTC

Size: 1.10 KB

patch

obsolete

>diff --git a/ceph.spec b/ceph.spec
>index 69f95f5..8e4aaf2 100644
>--- a/ceph.spec
>+++ b/ceph.spec
>@@ -22,9 +22,6 @@ Source0:        https://ceph.com/download/%{name}-0.81.tar.bz2
> Patch0:         ceph-0.81.0-test-librbd-fsx.c.patch
> Patch1:         ceph-0.81.0-Makefile.in.patch
> Patch2:         ceph-0.81.0-configure.ac.patch
>-%if ( 0%{?fedora} && 0%{?fedora} > 20 )
>-ExcludeArch:	armv7hl
>-%endif
> %if ( 0%{?rhel} && 0%{?rhel} < 7 )
> ExcludeArch:	ppc ppc64
> %endif
>@@ -306,6 +303,11 @@ MY_CONF_OPT=""
> 
> MY_CONF_OPT="$MY_CONF_OPT --with-radosgw"
> 
>+%ifarch %{arm}
>+# libatomic_ops seems to fallback on some pthread implementation on ARM
>+EXTRA_LDFLAGS="-lpthread"
>+%endif
>+
> export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
> 
> %{configure}	CPPFLAGS="$java_inc" \
>@@ -332,7 +334,8 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
> 		--without-tcmalloc \
> %endif
> %endif
>-		CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
>+		CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
>+		LDFLAGS="$EXTRA_LDFLAGS"
> 
> # fix bug in specific version of libedit-devel
> %if 0%{defined suse_version}

Actions: View

Attachments on bug 1116767: 916189