[DRE-commits] [SCM] ruby-ffi.git branch, master, updated. debian/1.0.11debian-2-1-gcc756e4

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit cc756e4ecaf21d360b1e7c1fefc66388b214e127
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Wed Jan 11 21:06:29 2012 -0200

    Add patch by Jurij Smakov to fix build on sparc

diff --git a/debian/patches/fix-test-on-sparc b/debian/patches/fix-test-on-sparc
new file mode 100644
index 0000000..7cec274
--- /dev/null
+++ b/debian/patches/fix-test-on-sparc
@@ -0,0 +1,16 @@
+Description: guard Solaris-specific SPARC code from non-Solaris hosts
+Author: Jurij Smakov <jurij at wooyd.org>
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/642266
+
+--- ruby-ffi-1.0.11debian.orig/libtest/NumberTest.c
++++ ruby-ffi-1.0.11debian/libtest/NumberTest.c
+@@ -23,7 +23,7 @@
+ #include <string.h>
+ #include <stdint.h>
+ 
+-#ifdef __sparc
++#if defined(__sparc) && defined(__sun__)
+     #define fix_mem_access __asm("ta 6")
+ #else
+     #define fix_mem_access
diff --git a/debian/patches/series b/debian/patches/series
index cb21e8a..13035bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Add-types.conf-files-for-missing-Debian-architecture.patch
+fix-test-on-sparc

-- 
ruby-ffi.git