[packages/Firebird] - disable fancy asm on x32

baggins baggins at pld-linux.org
Sat Jul 27 18:54:34 CEST 2024


commit d563b27ab66f9fed76c120fdc455b88eded4572e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Jul 27 18:30:32 2024 +0200

    - disable fancy asm on x32

 Firebird.spec |  5 +++++
 x32.patch     | 11 +++++++++++
 2 files changed, 16 insertions(+)
---
diff --git a/Firebird.spec b/Firebird.spec
index 39427e5..bbdb4b3 100644
--- a/Firebird.spec
+++ b/Firebird.spec
@@ -71,6 +71,7 @@ Patch11:	config.patch
 Patch12:	chown.patch
 Patch13:	cloop-honour-build-flags.patch
 Patch14:	mod_loader.patch
+Patch15:	x32.patch
 URL:		http://www.firebirdsql.org/
 BuildRequires:	autoconf >= 2.67
 BuildRequires:	automake
@@ -79,10 +80,12 @@ BuildRequires:	libatomic_ops
 BuildRequires:	libedit-devel
 BuildRequires:	libicu-devel
 BuildRequires:	libstdc++-devel
+BuildRequires:	libtomcrypt-devel
 BuildRequires:	libtommath-devel
 BuildRequires:	libtool >= 2:2
 # for lockfile
 BuildRequires:	procmail
+BuildRequires:	re2-devel
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
@@ -210,6 +213,7 @@ Skrypty startowe Firebirda w wersji Classic (inetd).
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 mkdir docs
 cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} \
@@ -236,6 +240,7 @@ cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8}
 	--with-gnu-ld \
 	--with-gpre-pascal \
 	--with-system-editline \
+	--with-system-re2 \
 	%{?debug:--enable-debug} \
 	--disable-rpath \
 	--disable-binreloc
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..f5781bd
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,11 @@
+--- Firebird-5.0.0.1306-0-source/extern/ttmath/ttmathtypes.h~	2024-07-27 06:21:08.000000000 +0200
++++ Firebird-5.0.0.1306-0-source/extern/ttmath/ttmathtypes.h	2024-07-27 06:25:23.419024747 +0200
+@@ -114,7 +114,7 @@
+ */
+ #ifndef TTMATH_FORCEASM
+ 
+-	#if !defined __i386__  && !defined _X86_ && !defined  _M_IX86 && !defined __x86_64__  && !defined _M_X64
++	#if !defined __i386__  && !defined _X86_ && !defined  _M_IX86 && !defined __x86_64__  && !defined _M_X64 || (defined __x86_64__ && defined __ILP32__)
+ 		/*!
+ 			x86 architecture:
+ 			__i386__    defined by GNU C
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/Firebird.git/commitdiff/d563b27ab66f9fed76c120fdc455b88eded4572e



More information about the pld-cvs-commit mailing list