blob: 21cedf63a48a835f70ba5fc3e9205690404ceb22 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
$NetBSD: patch-build_cmake_aom__configure.cmake,v 1.4.4.1 2022/05/20 13:05:56 bsiegert Exp $
- Don't disable fortify just because it's a release build.
- Set CPU correctly on SunOS.
- Add support for NetBSD/*arm*
--- build/cmake/aom_configure.cmake.orig 2022-02-15 07:20:42.000000000 +0000
+++ build/cmake/aom_configure.cmake
@@ -67,11 +67,16 @@ if(NOT AOM_TARGET_CPU)
endif()
elseif(cpu_lowercase STREQUAL "i386" OR cpu_lowercase STREQUAL "x86")
set(AOM_TARGET_CPU "x86")
- elseif(cpu_lowercase MATCHES "^arm" OR cpu_lowercase MATCHES "^mips")
+ if(${CMAKE_SIZEOF_VOID_P} EQUAL 4)
+ set(AOM_TARGET_CPU "x86")
+ elseif(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
+ set(AOM_TARGET_CPU "x86_64")
+ endif()
+ elseif(cpu_lowercase MATCHES "^(arm|earm)" OR cpu_lowercase MATCHES "^mips")
set(AOM_TARGET_CPU "${cpu_lowercase}")
elseif(cpu_lowercase MATCHES "aarch64")
set(AOM_TARGET_CPU "arm64")
- 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 "
@@ -322,9 +327,6 @@ else()
add_compiler_flag_if_supported("-Werror")
endif()
- if(build_type_lowercase MATCHES "rel")
- add_compiler_flag_if_supported("-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0")
- endif()
add_compiler_flag_if_supported("-D_LARGEFILE_SOURCE")
add_compiler_flag_if_supported("-D_FILE_OFFSET_BITS=64")
endif()
|
