Accepting request 495790 from home:NMoreyChaisemartin:branches:science:HPC

OBS-URL: https://build.opensuse.org/request/show/495790
OBS-URL: https://build.opensuse.org/package/show/science:HPC/mstflint?expand=0&rev=8
This commit is contained in:
Nicolas Morey-Chaisemartin 2017-05-18 07:14:14 +00:00 committed by Git OBS Bridge
parent a05eabac96
commit d8e2a0c702
3 changed files with 74 additions and 0 deletions

66
mstflint-armv7_arch.patch Normal file
View File

@ -0,0 +1,66 @@
diff --git common/compatibility.h common/compatibility.h
index badc368..c7020b3 100644
--- common/compatibility.h
+++ common/compatibility.h
@@ -59,6 +59,8 @@
# define ARCH_ppc64
# elif defined(__PPC__)
# define ARCH_ppc
+# elif defined(__ARM_ARCH_7A__)
+# define ARCH_armv7
# elif defined(__aarch64__)
# define ARCH_arm64
# elif defined(__s390__)
@@ -96,7 +98,7 @@
#define U16H_FMT "0x%04x"
#define U8H_FMT "0x%02x"
-#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_s390)
+#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_s390) || defined(__ARM_ARCH_7A__)
# if defined(__MINGW32__) || defined(__MINGW64__)
# include <inttypes.h>
# define U64D_FMT "0x%" PRId64
diff --git mtcr_ul/packets_common.h mtcr_ul/packets_common.h
index 7debdea..db3c0bd 100644
--- mtcr_ul/packets_common.h
+++ mtcr_ul/packets_common.h
@@ -148,6 +148,8 @@
# define ARCH_ppc64
# elif defined(__PPC__)
# define ARCH_ppc
+# elif defined(__ARM_ARCH_7A__)
+# define ARCH_armv7
# elif defined(__aarch64__)
# define ARCH_arm64
# elif defined(__s390__)
@@ -177,7 +179,7 @@
# define U8H_FMT "0x%02x"
# define U32D_FMT "%u"
# define STR_FMT "%s"
-#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(__MINGW32__) || defined(UEFI_BUILD) || defined(ARCH_s390)
+#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(__MINGW32__) || defined(UEFI_BUILD) || defined(ARCH_s390) || defined(__ARM_ARCH_7A__)
# define U64H_FMT "0x%016llx"
# define U64D_FMT "%llu"
# define U32H_FMT "0x%08x"
diff --git tools_layouts/adb_to_c_utils.h tools_layouts/adb_to_c_utils.h
index a7df0f9..628290a 100644
--- tools_layouts/adb_to_c_utils.h
+++ tools_layouts/adb_to_c_utils.h
@@ -137,6 +137,8 @@ extern "C" {
# define ARCH_ppc
# elif defined(__aarch64__)
# define ARCH_arm64
+# elif defined(__ARM_ARCH_7A__)
+# define ARCH_armv7
# elif defined(__s390__)
# define ARCH_s390
# elif defined(__s390x__)
@@ -173,7 +175,7 @@ extern "C" {
#define U16H_FMT "0x%04x"
#define U8H_FMT "0x%02x"
-#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD)
+#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(__ARM_ARCH_7A__)
# if defined(__MINGW32__) || defined(__MINGW64__)
# include <inttypes.h>
# define U64D_FMT "0x%" PRId64

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu May 18 05:54:00 UTC 2017 - nmoreychaisemartin@suse.com
- Add mstflint-armv7_arch.patch to support build on armv7l
-------------------------------------------------------------------
Fri Mar 31 11:21:24 UTC 2017 - nmoreychaisemartin@suse.com

View File

@ -36,6 +36,8 @@ Patch1: mstflint-s390_arch.patch
Patch2: mstflint-4.4.0-implicit-declaration.patch
# PATCH-FIX-UPSTREAM no __DATE__ and __TIME__ in codes
Patch3: mstflint-4.4.0-no-date-time.patch
# PATCH-FIX-UPSTREAM Add all needed defines to get it built on armv7
Patch4: mstflint-armv7_arch.patch
BuildRequires: gcc-c++
BuildRequires: libibmad-devel
@ -58,6 +60,7 @@ the downloads page at the Mellanox web site.
%patch1
%patch2
%patch3
%patch4
%build
./autogen.sh