[SCM] ableton-link/master: Patch to disable '-m32/-m64' by default.

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 28fb6d247c8a22eca7ba4fab961ac03b5ccee23e
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Sun Oct 30 20:47:26 2016 +0100

    Patch to disable '-m32/-m64' by default.
    
    Closes: #842410

diff --git a/debian/patches/DEBIAN_default_word_size.patch b/debian/patches/DEBIAN_default_word_size.patch
new file mode 100644
index 0000000..40d3a75
--- /dev/null
+++ b/debian/patches/DEBIAN_default_word_size.patch
@@ -0,0 +1,42 @@
+Description: use default word size
+ rather than using '-m32' and '-m64' we just use the defaults for a system.
+ this is likely to produce more consistent results on the large variety of archs
+ we have in Debian (that is: "not just amd64")
+Author: IOhannes m zmölnig
+Bug: https://github.com/Ableton/link/issues/18
+Last-Update: 2016-10-30
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- ableton-link.orig/cmake_include/ConfigureCompileFlags.cmake
++++ ableton-link/cmake_include/ConfigureCompileFlags.cmake
+@@ -52,6 +52,8 @@
+       ${build_flags_COMMON_LIST}
+       "-m64"
+     )
++  elseif(${LINK_WORD_SIZE} STREQUAL "native")
++    message(STATUS "Using default word size")
+   else()
+     message(FATAL_ERROR "Invalid word size '${LINK_WORD_SIZE}', must be either 32 or 64.")
+   endif()
+--- ableton-link.orig/cmake_include/ConfigureWordSize.cmake
++++ ableton-link/cmake_include/ConfigureWordSize.cmake
+@@ -16,6 +16,8 @@
+     elseif(${LINK_WORD_SIZE} EQUAL 64)
+       set_target_properties(${target} PROPERTIES COMPILE_FLAGS "-m64")
+       set_target_properties(${target} PROPERTIES LINK_FLAGS "-m64")
++    elseif(${LINK_WORD_SIZE} STREQUAL "native")
++      message(STATUS "Using default word size")
+     else()
+       message(FATAL_ERROR "Invalid word size '${LINK_WORD_SIZE}', must be either 32 or 64.")
+     endif()
+--- ableton-link.orig/CMakeLists.txt
++++ ableton-link/CMakeLists.txt
+@@ -14,7 +14,7 @@
+ option(LINK_BUILD_QT_EXAMPLES "Build examples (Requires Qt)" OFF)
+ 
+ if(UNIX)
+-  set(LINK_WORD_SIZE "64" CACHE STRING "Set the word size (must be either 32 or 64)")
++  set(LINK_WORD_SIZE "native" CACHE STRING "Set the word size (must be either 32 or 64 (or 'native')")
+   option(LINK_ENABLE_ASAN "Build with Address Sanitizier (ASan)" OFF)
+ endif()
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 33660b6..5583311 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 DEBIAN_system_libraries.patch
 DEBIAN_catch.patch
+DEBIAN_default_word_size.patch
 fix_linearregression_test.patch
 jack_support.patch

-- 
ableton-link packaging