From 7482c7e752de72a46ddc877b7313086c338edc868c4fbba1a62bbd63778bd100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 1 Mar 2013 10:23:25 +0000 Subject: [PATCH] Accepting request 156876 from devel:ARM:AArch64:Factory - cmake-endian.patch: Add support for aarch64. OBS-URL: https://build.opensuse.org/request/show/156876 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=107 --- cmake-endian.patch | 33 +++++++++++++++++++++++++++++++++ cmake-gui.changes | 6 ++++++ cmake-gui.spec | 4 +++- cmake.changes | 6 ++++++ cmake.spec | 4 +++- 5 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 cmake-endian.patch diff --git a/cmake-endian.patch b/cmake-endian.patch new file mode 100644 index 0000000..27de189 --- /dev/null +++ b/cmake-endian.patch @@ -0,0 +1,33 @@ +From 349165223d26f0ffc5ad004b4a05a8a92121ac20 Mon Sep 17 00:00:00 2001 +From: Riku Voipio +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 +--- + 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." diff --git a/cmake-gui.changes b/cmake-gui.changes index 6aa3518..c842b51 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -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 diff --git a/cmake-gui.spec b/cmake-gui.spec index 607c522..7304538 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -21,6 +21,7 @@ Version: 2.8.10.2 Release: 0 Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v2.8/cmake-%{version}.tar.gz +Patch3: cmake-endian.patch Patch4: cmake-disable-builtin-chrpath.diff Summary: CMake graphical user interface License: BSD-3-Clause @@ -50,6 +51,7 @@ open-source make system. %prep %setup -q -n cmake-%{version} +%patch3 -p1 %patch4 %build diff --git a/cmake.changes b/cmake.changes index 572d063..49a26bc 100644 --- a/cmake.changes +++ b/cmake.changes @@ -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 diff --git a/cmake.spec b/cmake.spec index 20e3c01..f21780a 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,7 +1,7 @@ # # 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 # 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 Patch1: cmake-disable-builtin-chrpath.diff Patch2: cmake-fix-ruby-test.patch +Patch3: cmake-endian.patch Summary: Cross-platform, open-source make system License: BSD-3-Clause Group: Development/Tools/Building @@ -51,6 +52,7 @@ CMake is a cross-platform, open-source make system %setup -q %patch1 %patch2 +%patch3 -p1 %build export CXXFLAGS="$RPM_OPT_FLAGS"