Attachment 575174 Details for Bug 799153 – Changed to ceph.spec to complete building of ceph-0.44

[patch] Changed to ceph.spec to complete building of ceph-0.44

bz799153-build-ceph-on-arm.patch (text/plain), 1.32 KB, created by Niels de Vos on 2012-04-04 15:33:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Niels de Vos

Created: 2012-04-04 15:33:46 UTC

Size: 1.32 KB

patch

obsolete

>diff --git a/ceph.spec b/ceph.spec
>index 705c0f2..259fe31 100644
>--- a/ceph.spec
>+++ b/ceph.spec
>@@ -1,6 +1,6 @@
> Name:          ceph
> Version:       0.44
>-Release:       4%{?dist}
>+Release:       4%{?dist}.0.arm
> Summary:       User space components of the Ceph file system
> License:       LGPLv2
> Group:         System Environment/Base
>@@ -88,13 +88,25 @@ file system.
> 
> %build
> ./autogen.sh
>+
>+%ifarch armv5tel
>+# libatomic_ops does not have correct asm for ARMv5tel
>+EXTRA_CFLAGS="-DAO_USE_PTHREAD_DEFS"
>+%endif
>+%ifarch %arm
>+# libatomic_ops seems to fallback on some pthread implementation on ARM
>+EXTRA_LDFLAGS="-lpthread"
>+%endif
>+
> %{configure} --prefix=/usr --sbindir=/sbin \
> --localstatedir=/var --sysconfdir=/etc \
> %ifarch ppc ppc64 s390 s390x
> --without-tcmalloc \
> %endif
> --without-hadoop --with-radosgw --with-gtk2 \
>-CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
>+CFLAGS="$RPM_OPT_FLAGS $EXTRA_CFLAGS" \
>+CXXFLAGS="$RPM_OPT_FLAGS $EXTRA_CFLAGS" \
>+LDFLAGS="$EXTRA_LDFLAGS"
> 
> make %{?_smp_mflags}
> 
>@@ -245,6 +257,10 @@ fi
> %{_bindir}/boto_tool
> 
> %changelog
>+* Wed Apr  4 2012 Niels de Vos <devos@fedoraproject.org> - 0.44-4.0.arm
>+- Add LDFLAGS=-lpthread on any ARM architecture
>+- Add CFLAGS=-DAO_USE_PTHREAD_DEFS on ARMv5tel
>+
> * Mon Mar 26 2012 Dan HorÃ¡k <dan[at]danny.cz> 0.44-4
> - gperftools not available also on ppc
>

Actions: View | Diff

Attachments on bug 799153: 566953 | 568191 | 575052 | 575174