[Pkg-ceph-commits] [ceph] 01/04: new "arch.patch" to use dpkg-architecture to detect build architecture

[Dmitry Smirnov]

This is an automated email from the git hooks/post-receive script.

onlyjob pushed a commit to branch experimental
in repository ceph.

commit 1dafa77
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Sat Apr 19 04:47:52 2014

    new "arch.patch" to use dpkg-architecture to detect build architecture
---
 debian/patches/arch.patch | 19 +++++++++++++++++++
 debian/patches/series     |  1 +
 2 files changed, 20 insertions(+)

diff --git a/debian/patches/arch.patch b/debian/patches/arch.patch
new file mode 100644
index 0000000..0e09bc5
--- /dev/null
+++ b/debian/patches/arch.patch
@@ -0,0 +1,19 @@
+Last-Update: 2014-04-19
+Forwarded: not-needed
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+Description: use `dpkg-architecture` instead of `arch` to get build architecture
+ Fixes build in `pbuilder` on amd64 for i386.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -86,9 +86,9 @@
+ 
+ # Check for yasm
+ if yasm -f elf64 src/common/crc32c_intel_fast_asm.S -o /dev/null; then
+    echo 'we have a modern and working yasm'
+-   if test `arch` = "x86_64"; then
++   if test `dpkg-architecture -qDEB_BUILD_GNU_CPU` = "x86_64"; then
+       echo 'we are x86_64'
+       AC_DEFINE([HAVE_GOOD_YASM_ELF64], [1], [we have a recent yasm and are x86_64])
+       with_good_yasm=yes
+    fi
diff --git a/debian/patches/series b/debian/patches/series
index c8ad410..cc8f0f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 5469.patch
 8008.patch
 _1606.patch
+arch.patch
 gcj.patch
 modules.patch
 spelling.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git