Commit a7257878 authored by Mike Gabriel's avatar Mike Gabriel

update and rename: 1007_detect-arm-arch-correctly.patch. As proposed by Aurelien Jarno. THANKS!

parent 56a92946
Description: Detect more known architectures
Description: Detect arm architecture correctly
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
--- a/cmake/ConfigOptions.cmake
+++ b/cmake/ConfigOptions.cmake
@@ -6,8 +6,24 @@
@@ -6,7 +6,7 @@
elseif((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (CMAKE_SIZEOF_VOID_P EQUAL 8) AND (APPLE))
# Mac is weird like that.
set(TARGET_ARCH "x64")
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
+ set(TARGET_ARCH "ARM64")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^armv7")
+ set(TARGET_ARCH "ARMHF")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm.*")
set(TARGET_ARCH "ARM")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha")
+ set(TARGET_ARCH "ALPHA")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
+ set(TARGET_ARCH "PPC64")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
+ set(TARGET_ARCH "PPC")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc")
+ set(TARGET_ARCH "SPARC")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(parisc|hppa)")
+ set(TARGET_ARCH "HPPA")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^s390")
+ set(TARGET_ARCH "S390")
endif()
option(WITH_MANPAGES "Generate manpages." ON)
......@@ -4,6 +4,6 @@
1004_64-bit-architectures.patch
1005_parse-buffer-endianess.patch
1006_test-unicode-endianess.patch
1007_detect-more-architectures.patch
1007_detect-arm-arch-correctly.patch
1008_gcc-fPIC-on-arm64.patch
2001_detect-ffmpeg-on-Debian.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment