From: Laszlo Boszormenyi Date: Sun, 20 Mar 2011 07:23:22 +0000 (+0100) Subject: Disable libatomic-ops on armel archs X-Git-Tag: v0.26~88 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5959e76e2cb7124db6f9d04707cd021e4de8666e;p=ceph.git Disable libatomic-ops on armel archs armel supports ARMv4t or above instructions sets. libatomic-ops is only usable with Ceph for ARMv6 or above. Signed-off-by: Hector Oron --- diff --git a/debian/changelog b/debian/changelog index e2be88146e1e..c10207505633 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ ceph (0.26~rc-1) experimental; urgency=low google-perftools (closes: #614890). * Correct section of libcrush1, librados1, librbd1 and libceph1 to libs. * Make Ceph cross buildable (closes: #618939), thanks to Hector Oron. + * Disable libatomic-ops on ARMv4t (armel) archs to prevent FTBFS + (closes: #615235), thanks go to Hector Oron again. -- Laszlo Boszormenyi (GCS) Mon, 21 Mar 2011 11:34:02 -0800 diff --git a/debian/rules b/debian/rules index d40dee07a2eb..cf178d970322 100755 --- a/debian/rules +++ b/debian/rules @@ -18,6 +18,14 @@ else confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) endif +export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) + +ifeq ($(DEB_HOST_ARCH), armel) + # armel supports ARMv4t or above instructions sets. + # libatomic-ops is only usable with Ceph for ARMv6 or above. + extraopts += --without-libatomic-ops +endif + configure: configure-stamp configure-stamp: dh_testdir @@ -29,7 +37,7 @@ build-stamp: configure-stamp ./autogen.sh ./configure --prefix=/usr --sbindir=/sbin --localstatedir=/var \ - --sysconfdir=/etc $(confflags) + --sysconfdir=/etc $(extraopts) $(confflags) $(MAKE) cp src/init-ceph debian/ceph.init cp src/logrotate.conf debian/ceph.logrotate