Loading pkgs/applications/radio/uhd/default.nix +0 −2 Original line number Diff line number Diff line Loading @@ -121,8 +121,6 @@ stdenv.mkDerivation rec { patches = [ # Disable tests that fail in the sandbox ./no-adapter-tests.patch ] ++ lib.optionals stdenv.isAarch32 [ ./neon.patch ]; postPhases = [ "installFirmware" "removeInstalledTests" ] Loading pkgs/applications/radio/uhd/neon.patchdeleted 100644 → 0 +0 −19 Original line number Diff line number Diff line Description: When building for armhf, enable NEON NEON is part of the armhf baseline, so this will always be enabled on armhf. Author: Paul Tagliamonte <paultag@debian.org> Bug-Debian: https://bugs.debian.org/873608 Origin: vendor Last-Update: 2017-08-29 --- uhd-3.10.2.0.orig/host/lib/convert/CMakeLists.txt +++ uhd-3.10.2.0/host/lib/convert/CMakeLists.txt @@ -67,6 +67,8 @@ IF(HAVE_ARM_NEON_H AND (${CMAKE_SIZEOF_V ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp ${CMAKE_CURRENT_SOURCE_DIR}/convert_neon.S ) + + SET ( CMAKE_CXX_FLAGS "-mfpu=neon" ) ENDIF() ######################################################################## Loading
pkgs/applications/radio/uhd/default.nix +0 −2 Original line number Diff line number Diff line Loading @@ -121,8 +121,6 @@ stdenv.mkDerivation rec { patches = [ # Disable tests that fail in the sandbox ./no-adapter-tests.patch ] ++ lib.optionals stdenv.isAarch32 [ ./neon.patch ]; postPhases = [ "installFirmware" "removeInstalledTests" ] Loading
pkgs/applications/radio/uhd/neon.patchdeleted 100644 → 0 +0 −19 Original line number Diff line number Diff line Description: When building for armhf, enable NEON NEON is part of the armhf baseline, so this will always be enabled on armhf. Author: Paul Tagliamonte <paultag@debian.org> Bug-Debian: https://bugs.debian.org/873608 Origin: vendor Last-Update: 2017-08-29 --- uhd-3.10.2.0.orig/host/lib/convert/CMakeLists.txt +++ uhd-3.10.2.0/host/lib/convert/CMakeLists.txt @@ -67,6 +67,8 @@ IF(HAVE_ARM_NEON_H AND (${CMAKE_SIZEOF_V ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp ${CMAKE_CURRENT_SOURCE_DIR}/convert_neon.S ) + + SET ( CMAKE_CXX_FLAGS "-mfpu=neon" ) ENDIF() ########################################################################