commit c127f4219f1204a2155b5dd23efad851e981f3a0
Author: Jan Rękorajski <[email protected]>
Date: Wed Oct 31 22:06:42 2018 +0100
- fix build on x32
mstflint.spec | 2 ++
x32.patch | 31 +++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+)
---
diff --git a/mstflint.spec b/mstflint.spec
index dedbfe1..331d44f 100644
--- a/mstflint.spec
+++ b/mstflint.spec
@@ -9,6 +9,7 @@ Group: Networking/Utilities
Source0:
https://github.com/Mellanox/mstflint/releases/download/v%{upstream_ver}/%{name}-%{upstream_ver}.tar.gz
# Source0-md5: 0fd75b78de3fc46d2cf951eead225a5b
Patch0: openssl-1.1.patch
+Patch1: x32.patch
URL: https://github.com/Mellanox/mstflint
BuildRequires: libibmad-devel
BuildRequires: libstdc++-devel
@@ -40,6 +41,7 @@ Pliki nagłówkowe do dostępu do kart HCA/NIC Mellanox.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%configure \
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..21c2af7
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,31 @@
+--- mstflint-4.10.0/tools_layouts/adb_to_c_utils.h~ 2018-08-28
15:47:51.000000000 +0200
++++ mstflint-4.10.0/tools_layouts/adb_to_c_utils.h 2018-10-31
21:54:40.265218982 +0100
+@@ -169,7 +169,7 @@
+ #define U16H_FMT "0x%04x"
+ #define U8H_FMT "0x%02x"
+
+-#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) ||
defined(ARCH_arm6l)
++#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) ||
defined(ARCH_arm6l) || (defined(ARCH_x86_64) && defined(__ILP32__))
+ # if defined(__MINGW32__) || defined(__MINGW64__)
+ # include <inttypes.h>
+ # define U64D_FMT "0x%" PRId64
+--- mstflint-4.10.0/common/compatibility.h~ 2018-08-28 15:47:44.000000000
+0200
++++ mstflint-4.10.0/common/compatibility.h 2018-10-31 21:56:56.203556144
+0100
+@@ -40,7 +40,7 @@
+
+ #include <stdio.h>
+
+-#if defined(__ia64__) || defined(__x86_64__) || defined(__PPC64__) ||
defined(__arm__)
++#if defined(__ia64__) || (defined(__x86_64__) && !defined(__ILP32__)) ||
defined(__PPC64__) || defined(__arm__)
+ #define U64L "l"
+ #else
+ #define U64L "ll"
+@@ -94,7 +94,7 @@
+ #define U16H_FMT "0x%04x"
+ #define U8H_FMT "0x%02x"
+
+-#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) ||
defined(ARCH_arm6l)
++#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) ||
defined(ARCH_arm6l) || (defined(ARCH_x86_64) && defined(__ILP32__))
+ # if defined(__MINGW32__) || defined(__MINGW64__)
+ # include <inttypes.h>
+ # define U64D_FMT "0x%" PRId64
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mstflint.git/commitdiff/c127f4219f1204a2155b5dd23efad851e981f3a0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
