File avidemux-cpu-detection-fix.patch of Package avidemux3

File avidemux-cpu-detection-fix.patch of Package avidemux3 (Revision 48)

Currently displaying revision 48 , Show latest

From: Jiri Slaby <jslaby@suse.cz>
Date: Tue, 12 Nov 2019 11:28:37 +0100
Subject: cmake: fix detection of CPUs
Patch-mainline: yes
Git-commit: 82ab993cbbe17c71ca20c4af7b1a4b6f9fa95c45
References: build fix

The code defines a function foo returning int, but contains no return.
So the detection fails with "CPU not supported". As new gccs warng abotu
missing return, it causes the detaction to fail. Switch foo to return
void.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
 cmake/cmake_compile_check/cpu_armel_check.cpp  | 2 +-
 cmake/cmake_compile_check/cpu_x86-64_check.cpp | 2 +-
 cmake/cmake_compile_check/cpu_x86_check.cpp    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/cmake_compile_check/cpu_armel_check.cpp b/cmake/cmake_compile_check/cpu_armel_check.cpp
index 429661add08c..02f779c71b7b 100644
--- a/cmake/cmake_compile_check/cpu_armel_check.cpp
+++ b/cmake/cmake_compile_check/cpu_armel_check.cpp
@@ -1,4 +1,4 @@
-int foo(void)
+void foo(void)
 {
 
 	asm volatile ("mov lr,pc " : : );
diff --git a/cmake/cmake_compile_check/cpu_x86-64_check.cpp b/cmake/cmake_compile_check/cpu_x86-64_check.cpp
index 49c751b6fbe8..4f493bc5cdaf 100644
--- a/cmake/cmake_compile_check/cpu_x86-64_check.cpp
+++ b/cmake/cmake_compile_check/cpu_x86-64_check.cpp
@@ -1,4 +1,4 @@
-int foo(void)
+void foo(void)
 {
 	asm volatile ("movdqa %xmm8, 0");
 }
diff --git a/cmake/cmake_compile_check/cpu_x86_check.cpp b/cmake/cmake_compile_check/cpu_x86_check.cpp
index c4e8f7f432a5..cd00b66c0524 100644
--- a/cmake/cmake_compile_check/cpu_x86_check.cpp
+++ b/cmake/cmake_compile_check/cpu_x86_check.cpp
@@ -1,4 +1,4 @@
-int foo(void)
+void foo(void)
 {
 	asm volatile ("movdqa %xmm7, 0");
 }
-- 
2.24.0