SHA256
3
0
forked from pool/cmake

Accepting request 156954 from devel:tools:building

- cmake-endian.patch:
  Add support for aarch64. (forwarded request 156876 from Andreas_Schwab)

OBS-URL: https://build.opensuse.org/request/show/156954
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=64
This commit is contained in:
Stephan Kulow 2013-03-01 12:56:16 +00:00 committed by Git OBS Bridge
commit 6994e12c65
5 changed files with 51 additions and 2 deletions

33
cmake-endian.patch Normal file
View File

@ -0,0 +1,33 @@
From 349165223d26f0ffc5ad004b4a05a8a92121ac20 Mon Sep 17 00:00:00 2001
From: Riku Voipio <riku.voipio@linaro.org>
Date: Fri, 21 Dec 2012 13:20:02 +0200
Subject: [PATCH] KWIML: Teach ABI.h about Aarch64
The __aarch64__ defines Aarch64, while __AARCH64EB__ defines bigendian
and __AARCH64EL__ little endian. Only little endian tested, no big
endian toolchain exists yet.
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---
Utilities/KWIML/ABI.h.in | 8 ++++++++
1 file changed, 8 insertions(+)
Index: cmake-2.8.10.2/Utilities/KWIML/ABI.h.in
===================================================================
--- cmake-2.8.10.2.orig/Utilities/KWIML/ABI.h.in
+++ cmake-2.8.10.2/Utilities/KWIML/ABI.h.in
@@ -414,6 +414,14 @@ suppression macro @KWIML@_ABI_NO_VERIFY
#elif defined(__SYSC_ZARCH__)
# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG
+/* Aarch64 */
+#elif defined(__aarch64__)
+# if !defined(__AARCH64EB__)
+# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_LITTLE
+# else
+# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG
+# endif
+
/* Unknown CPU */
#elif !defined(@KWIML@_ABI_NO_ERROR_ENDIAN)
# error "Byte order of target CPU unknown."

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Feb 28 16:54:13 UTC 2013 - schwab@suse.de
- cmake-endian.patch:
Add support for aarch64.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 28 00:29:29 UTC 2012 - cgiboudeaux@gmx.com Wed Nov 28 00:29:29 UTC 2012 - cgiboudeaux@gmx.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package cmake-gui # spec file for package cmake-gui
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -21,6 +21,7 @@ Version: 2.8.10.2
Release: 0 Release: 0
Url: http://www.cmake.org/ Url: http://www.cmake.org/
Source0: http://www.cmake.org/files/v2.8/cmake-%{version}.tar.gz Source0: http://www.cmake.org/files/v2.8/cmake-%{version}.tar.gz
Patch3: cmake-endian.patch
Patch4: cmake-disable-builtin-chrpath.diff Patch4: cmake-disable-builtin-chrpath.diff
Summary: CMake graphical user interface Summary: CMake graphical user interface
License: BSD-3-Clause License: BSD-3-Clause
@ -50,6 +51,7 @@ open-source make system.
%prep %prep
%setup -q -n cmake-%{version} %setup -q -n cmake-%{version}
%patch3 -p1
%patch4 %patch4
%build %build

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Feb 28 16:54:13 UTC 2013 - schwab@suse.de
- cmake-endian.patch:
Add support for aarch64.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 28 00:29:29 UTC 2012 - cgiboudeaux@gmx.com Wed Nov 28 00:29:29 UTC 2012 - cgiboudeaux@gmx.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package cmake # spec file for package cmake
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -23,6 +23,7 @@ Url: http://www.cmake.org/
Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
Patch1: cmake-disable-builtin-chrpath.diff Patch1: cmake-disable-builtin-chrpath.diff
Patch2: cmake-fix-ruby-test.patch Patch2: cmake-fix-ruby-test.patch
Patch3: cmake-endian.patch
Summary: Cross-platform, open-source make system Summary: Cross-platform, open-source make system
License: BSD-3-Clause License: BSD-3-Clause
Group: Development/Tools/Building Group: Development/Tools/Building
@ -51,6 +52,7 @@ CMake is a cross-platform, open-source make system
%setup -q %setup -q
%patch1 %patch1
%patch2 %patch2
%patch3 -p1
%build %build
export CXXFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS"