diff options
Diffstat (limited to 'multimedia/aom/files/patch-build_cmake_aom__configure.cmake')
| -rw-r--r-- | multimedia/aom/files/patch-build_cmake_aom__configure.cmake | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/multimedia/aom/files/patch-build_cmake_aom__configure.cmake b/multimedia/aom/files/patch-build_cmake_aom__configure.cmake index 25d9467d6633..5b2650ea5d63 100644 --- a/multimedia/aom/files/patch-build_cmake_aom__configure.cmake +++ b/multimedia/aom/files/patch-build_cmake_aom__configure.cmake @@ -1,21 +1,22 @@ - FreeBSD and NetBSD powerpc* targets don't abbreviate to ppc* - ARM uses compiler intrinsics, so don't require GNU as ---- build/cmake/aom_configure.cmake.orig 2020-02-07 16:59:05 UTC +--- build/cmake/aom_configure.cmake.orig 2021-02-23 19:51:03 UTC +++ build/cmake/aom_configure.cmake -@@ -74,7 +74,7 @@ if(NOT AOM_TARGET_CPU) +@@ -71,7 +71,7 @@ if(NOT AOM_TARGET_CPU) set(AOM_TARGET_CPU "${cpu_lowercase}") - elseif("${cpu_lowercase}" MATCHES "aarch64") + elseif(cpu_lowercase MATCHES "aarch64") set(AOM_TARGET_CPU "arm64") -- elseif("${cpu_lowercase}" MATCHES "^ppc") -+ elseif("${cpu_lowercase}" MATCHES "^ppc|^powerpc") +- elseif(cpu_lowercase MATCHES "^ppc") ++ elseif(cpu_lowercase MATCHES "^ppc|^powerpc") set(AOM_TARGET_CPU "ppc") else() message(WARNING "The architecture ${CMAKE_SYSTEM_PROCESSOR} is not " -@@ -162,17 +162,6 @@ elseif("${AOM_TARGET_CPU}" MATCHES "arm") +@@ -159,17 +159,6 @@ elseif(AOM_TARGET_CPU MATCHES "arm") + if(NOT AS_EXECUTABLE) set(AS_EXECUTABLE as) endif() - endif() +- endif() - find_program(as_executable_found ${AS_EXECUTABLE}) - if(NOT as_executable_found) - message( @@ -26,7 +27,6 @@ - "to your CMake command line." - "To build without optimizations, add -DAOM_TARGET_CPU=generic to your " - "cmake command line.") -- endif() + endif() string(STRIP "${AOM_AS_FLAGS}" AOM_AS_FLAGS) endif() - |