Package: blender
Version: 2.69-4
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch



In Ubuntu, the attached patch was applied to achieve the following:

  * Add aarch64 to 0012-fix_FTBFS_on_unofficial_64bit_archs.patch for arm64.

Do note that __aarch64__ (ARM's ARMv8) and __arch64__ (the macro used
to detect 64-bit on __sparc__) are not the same thing, you do need both
as my patch has here.  This has confused many people in the past. ;)

... Adam

-- System Information:
Debian Release: jessie/sid
  APT prefers trusty-updates
  APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500, 'trusty')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.13.0-17-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru blender-2.69/debian/patches/0012-fix_FTBFS_on_unofficial_64bit_archs.patch blender-2.69/debian/patches/0012-fix_FTBFS_on_unofficial_64bit_archs.patch
--- blender-2.69/debian/patches/0012-fix_FTBFS_on_unofficial_64bit_archs.patch	2014-02-17 04:21:23.000000000 -0700
+++ blender-2.69/debian/patches/0012-fix_FTBFS_on_unofficial_64bit_archs.patch	2014-03-22 15:34:33.000000000 -0600
@@ -15,7 +15,7 @@
  #endif
  
 -#if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__)
-+#if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__) || defined(__s390x__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__))
++#if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__) || defined(__s390x__) || defined(__powerpc64__) || defined(__aarch64__) || (defined(__sparc__) && defined(__arch64__))
  #  define LG_SIZEOF_PTR 3
  #  define LG_SIZEOF_INT 2
  #else

Reply via email to