Update to d99c4be (patch upstreamed)
This commit is contained in:
parent
404c50e68a
commit
717d60c50c
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@
|
||||
/cmake-9416f297430bc358eea48f8cf65aa0d602029629.tar.gz
|
||||
/cmake-41a3a293f708566bf8cc2196ea2e671205821584.tar.gz
|
||||
/cmake-2825506c79a92c32a27d76cbfde4f82d4d1f7ff8.tar.gz
|
||||
/cmake-d99c4be9e1899c1578d8b4ca4cb7af8f1fc5082f.tar.gz
|
||||
|
34
10.patch
34
10.patch
@ -1,34 +0,0 @@
|
||||
From 66325144daed7bb608b3a0b5a8de0525d4f601da Mon Sep 17 00:00:00 2001
|
||||
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
|
||||
Date: Thu, 4 Aug 2022 09:57:20 -0400
|
||||
Subject: [PATCH] Add s390x to c4_get_target_cpu_architecture
|
||||
|
||||
Also add it to c4_get_target_cpu_architecture_defines.
|
||||
|
||||
Reference: https://sourceforge.net/p/predef/wiki/Architectures/
|
||||
---
|
||||
TargetArchitecture.cmake | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/TargetArchitecture.cmake b/TargetArchitecture.cmake
|
||||
index 2bf54d8..57baf66 100644
|
||||
--- a/TargetArchitecture.cmake
|
||||
+++ b/TargetArchitecture.cmake
|
||||
@@ -28,6 +28,8 @@ function(c4_get_architecture_defines output_var)
|
||||
set(defines __riscv64__)
|
||||
elseif("${arch}" STREQUAL "riscv32")
|
||||
set(defines __riscv32__)
|
||||
+ elseif("${arch}" STREQUAL "s390x")
|
||||
+ set(defines __s390x__)
|
||||
else()
|
||||
message(FATAL_ERROR "unknown target architecture: ${arch}")
|
||||
endif()
|
||||
@@ -90,6 +92,8 @@ function(c4_get_target_cpu_architecture output_var)
|
||||
#else
|
||||
#error cmake_ARCH riscv32
|
||||
#endif
|
||||
+#elif defined(__s390x__) || defined(__zarch__)
|
||||
+ #error cmake_ARCH s390x
|
||||
#endif
|
||||
#error cmake_ARCH unknown
|
||||
")
|
@ -1,5 +1,5 @@
|
||||
%global commit 2825506c79a92c32a27d76cbfde4f82d4d1f7ff8
|
||||
%global snapdate 20220802
|
||||
%global commit d99c4be9e1899c1578d8b4ca4cb7af8f1fc5082f
|
||||
%global snapdate 20220804
|
||||
|
||||
Name: c4project
|
||||
Summary: Useful CMake scripts
|
||||
@ -16,10 +16,6 @@ Source0: %{url}/archive/%{commit}/cmake-%{commit}.tar.gz
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
# Add s390x to c4_get_target_cpu_architecture
|
||||
# https://github.com/biojppm/cmake/pull/10
|
||||
Patch: %{url}/pull/10.patch
|
||||
|
||||
Requires: cmake-filesystem
|
||||
Requires: git-core
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (cmake-2825506c79a92c32a27d76cbfde4f82d4d1f7ff8.tar.gz) = 1df517b5e1e2476c727032b2a3d61e34b57bcfecd2d93db56ba125a8148d4e16ab2d6b3e95fa689dc600f49380330c38047d5a56cd8c027624d3f31255e78677
|
||||
SHA512 (cmake-d99c4be9e1899c1578d8b4ca4cb7af8f1fc5082f.tar.gz) = fba257403ed6bbd5554e880da94ae37828e8aeea9505b52c7296b79e726bec5ae227b3483d5fa41270d82d609fa2f2d6380a743d5ae4ecfd38bf449882a1fbcc
|
||||
|
Loading…
Reference in New Issue
Block a user