diff -Nru volk-1.2/debian/changelog volk-1.2/debian/changelog --- volk-1.2/debian/changelog 2016-01-05 15:55:30.000000000 +0000 +++ volk-1.2/debian/changelog 2016-01-19 14:04:10.000000000 +0000 @@ -1,3 +1,10 @@ +volk (1.2-1+rpi1) stretch-staging; urgency=medium + + [changes brought forward from 1.1-1+rpi1 by Peter Michael Green at Sun, 20 Sep 2015 20:30:19 +0000] + * Disable neon. + + -- Raspbian forward porter Tue, 19 Jan 2016 14:04:10 +0000 + volk (1.2-1) unstable; urgency=medium * New upstream release diff -Nru volk-1.2/debian/patches/disable-neon volk-1.2/debian/patches/disable-neon --- volk-1.2/debian/patches/disable-neon 1970-01-01 00:00:00.000000000 +0000 +++ volk-1.2/debian/patches/disable-neon 2016-01-19 14:04:10.000000000 +0000 @@ -0,0 +1,42 @@ +Description: Disable neon. +Author: Peter Michael Green + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: https://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +Index: volk-1.1/lib/CMakeLists.txt +=================================================================== +--- volk-1.1.orig/lib/CMakeLists.txt ++++ volk-1.1/lib/CMakeLists.txt +@@ -237,9 +237,9 @@ endif(NOT CPU_IS_x86) + ######################################################################## + # if building Debian armel, eliminate neon + ######################################################################## +-if(${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "arm-linux-gnueabi") +- OVERRULE_ARCH(neon "Architecture is not armhf") +-endif(${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "arm-linux-gnueabi") ++#if(${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "arm-linux-gnueabi") ++ OVERRULE_ARCH(neon "We don't want neon on raspbian") ++#endif(${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "arm-linux-gnueabi") + + ######################################################################## + # implement overruling in the ORC case, +@@ -414,7 +414,7 @@ if((${CMAKE_VERSION} VERSION_GREATER "2. + # set up the assembler flags and include the source files + foreach(ARCH ${ASM_ARCHS_AVAILABLE}) + string(REGEX MATCH "${ARCH}" ASM_ARCH "${available_archs}") +- if(( ASM_ARCH STREQUAL "neon" ) OR ( ${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7")) ++ if(( ASM_ARCH STREQUAL "neonxxxx" ) OR ( ${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7xxxx")) + message(STATUS "---- Adding ASM files") # we always use ATT syntax + message(STATUS "-- Detected neon architecture; enabling ASM") + # setup architecture specific assembler flags diff -Nru volk-1.2/debian/patches/series volk-1.2/debian/patches/series --- volk-1.2/debian/patches/series 2015-12-25 23:31:42.000000000 +0000 +++ volk-1.2/debian/patches/series 2016-01-19 14:04:10.000000000 +0000 @@ -1,3 +1,4 @@ native-armv7-build-support make-acc-happy debian-libver +disable-neon