From 5f1b08a2a1024c339fbbbf4cd23859c07cc2ac42 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 22 Dec 2015 08:49:03 +0100 Subject: [PATCH] - fix long type detection on x32 - rel 5 --- metakit.spec | 4 +++- x32.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 x32.patch diff --git a/metakit.spec b/metakit.spec index d92d6c6..416303f 100644 --- a/metakit.spec +++ b/metakit.spec @@ -2,13 +2,14 @@ Summary: Embeddable database Summary(pl.UTF-8): Baza danych Name: metakit Version: 2.4.9.7 -Release: 4 +Release: 5 License: GPL Group: Libraries Source0: http://www.equi4.com/pub/mk/%{name}-%{version}.tar.gz # Source0-md5: 17330257376eea657827ed632ea62c9e Patch0: %{name}-sparc64.patch Patch1: %{name}-build.patch +Patch2: x32.patch URL: http://www.equi4.com/metakit.html BuildRequires: autoconf BuildRequires: automake @@ -78,6 +79,7 @@ Moduły Tcl-a dla pakietu metakit. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build cd unix diff --git a/x32.patch b/x32.patch new file mode 100644 index 0000000..8cd8bec --- /dev/null +++ b/x32.patch @@ -0,0 +1,11 @@ +--- metakit-2.4.9.7/include/mk4.h~ 2015-12-22 08:45:55.000000000 +0100 ++++ metakit-2.4.9.7/include/mk4.h 2015-12-22 08:47:41.682352786 +0100 +@@ -101,7 +101,7 @@ + // and here's the other end of the scale... + #if !defined (_WIN32) && !defined (q4_LONG64) + #if defined (_PA_RISC2_0) || defined (__powerpc64__) || defined(__sparcv9) || \ +-defined(__x86_64__) || defined(__s390x__) || defined(__alpha) || \ ++(defined(__x86_64__) && !defined(__ILP32__)) || defined(__s390x__) || defined(__alpha) || \ + (defined(__ia64) && (!defined(__HP_aCC) || defined(__LP64__))) || \ + (defined(__sparc__) && defined(__arch64__)) + #define q4_LONG64 1 -- 2.44.0