X-Git-Url: http://git.pld-linux.org/?p=packages%2FFirebird.git;a=blobdiff_plain;f=Firebird-morearchs.patch;h=c7ae11606c21f14912a2cc286c725c5ba15c1c95;hp=0df6691327fc35b18bebc485a44db915c1071113;hb=2ff6472af750a2131c0a6faee4d16cb060eb0f5f;hpb=67566b4b908a7b6bb429ddd1aaac539a6eb1e839 diff --git a/Firebird-morearchs.patch b/Firebird-morearchs.patch index 0df6691..c7ae116 100644 --- a/Firebird-morearchs.patch +++ b/Firebird-morearchs.patch @@ -1,6 +1,6 @@ ---- firebird-1.5.0.4290/src/jrd/common.h.orig 2004-05-28 23:36:22.000000000 +0200 -+++ firebird-1.5.0.4290/src/jrd/common.h 2004-05-28 23:44:49.000000000 +0200 -@@ -131,6 +131,18 @@ +--- firebird-1.5.1.4500/src/jrd/common.h.orig 2004-05-28 23:36:22.000000000 +0200 ++++ firebird-1.5.1.4500/src/jrd/common.h 2004-05-28 23:44:49.000000000 +0200 +@@ -131,6 +131,14 @@ #define IMPLEMENTATION isc_info_db_impl_linux_sparc /* 65 */ #endif /* sparc */ @@ -11,30 +11,34 @@ +#ifdef __alpha__ +#define IMPLEMENTATION isc_info_db_impl_linux_alpha +#endif -+ -+#ifdef __x86_64__ -+#define IMPLEMENTATION isc_info_db_impl_linux_amd64 -+#endif + #define MEMMOVE(from,to,length) memmove ((void *)to, (void *)from, (size_t) length) #define MOVE_FAST(from,to,length) memcpy (to, from, (int) (length)) #define MOVE_FASTER(from,to,length) memcpy (to, from, (int) (length)) ---- firebird-1.5.0.4290/src/jrd/ibase.h.orig 2003-12-28 00:06:25.000000000 +0100 -+++ firebird-1.5.0.4290/src/jrd/ibase.h 2004-05-28 23:48:49.000000000 +0200 -@@ -1573,6 +1573,10 @@ - +--- firebird-1.5.1.4500/src/jrd/ibase.h.orig 2004-03-29 05:50:10.000000000 +0200 ++++ firebird-1.5.1.4500/src/jrd/ibase.h 2004-08-08 00:59:58.069029392 +0200 +@@ -57,7 +57,7 @@ + // It is difficult to detect 64-bit long from the redistributable header + // we do not care of 16-bit platforms anymore thus we may use plain "int" + // which is 32-bit on all platforms we support +-#if defined(_LP64) || defined(__LP64__) || defined(__arch64__) ++#if defined(_LP64) || defined(__LP64__) || defined(__arch64__) || defined(__alpha__) + typedef int ISC_LONG; + typedef unsigned int ISC_ULONG; + #else +@@ -1577,6 +1577,9 @@ isc_info_db_impl_linux_sparc = 65, + isc_info_db_impl_linux_amd64 = 66, -+ isc_info_db_impl_linux_ppc = 66, -+ isc_info_db_impl_linux_alpha = 67, -+ isc_info_db_impl_linux_amd64 = 68, ++ isc_info_db_impl_linux_ppc = 67, ++ isc_info_db_impl_linux_alpha = 68, + isc_info_db_impl_last_value /* Leave this LAST! */ }; ---- firebird-1.5.0.4290/src/jrd/pag.cpp.orig 2004-05-28 22:16:09.000000000 +0200 -+++ firebird-1.5.0.4290/src/jrd/pag.cpp 2004-05-28 23:58:59.000000000 +0200 -@@ -180,6 +180,15 @@ +--- firebird-1.5.1.4500/src/jrd/pag.cpp.orig 2004-05-28 22:16:09.000000000 +0200 ++++ firebird-1.5.1.4500/src/jrd/pag.cpp 2004-05-28 23:58:59.000000000 +0200 +@@ -180,6 +180,12 @@ #ifdef __sparc__ #define CLASS 20 #endif @@ -43,25 +47,58 @@ +#endif +#ifdef __alpha__ +#define CLASS 31 -+#endif -+#ifdef __x86_64__ -+#define CLASS 32 +#endif #endif #ifdef FREEBSD ---- firebird-1.5.0.4290/src/remote/xdr.cpp.orig 2004-05-29 00:05:08.000000000 +0200 -+++ firebird-1.5.0.4290/src/remote/xdr.cpp 2004-05-29 00:06:09.000000000 +0200 +--- firebird-1.5.1.4500/src/remote/xdr.cpp.orig 2004-08-08 00:57:44.918271384 +0200 ++++ firebird-1.5.1.4500/src/remote/xdr.cpp 2004-08-08 00:59:21.762548816 +0200 @@ -39,10 +39,10 @@ // The simpliest way to check it is to issue // "select abs(2.0/3.0) from rdb$database" from correct client // It will return big strange value in case of invalid define --#if defined(i386) || defined(I386) || defined(_M_IX86) -+#if defined(i386) || defined(I386) || defined(_M_IX86) || defined(__alpha__) || defined(__x86_64__) +-#if defined(i386) || defined(I386) || defined(_M_IX86) || defined(AMD64) ++#if defined(i386) || defined(I386) || defined(_M_IX86) || defined(AMD64) || defined(__alpha__) #define SWAP_DOUBLE #else --#if !defined(sparc) && !defined(__sparc__) && !defined(PowerPC) -+#if !defined(sparc) && !defined(__sparc__) && !defined(PowerPC) && !defined(__powerpc__) +-#if !defined(sparc) && !defined(PowerPC) ++#if !defined(sparc) && !defined(PowerPC) && !defined(__powerpc__) #error "Define SWAP_DOUBLE for your platform correctly !" #endif #endif +--- firebird-1.5.1.4500/src/jrd/utl.cpp.orig 2004-03-29 05:50:11.000000000 +0200 ++++ firebird-1.5.1.4500/src/jrd/utl.cpp 2004-08-08 14:13:50.000000000 +0200 +@@ -255,7 +255,10 @@ + "Firebird/Darwin/PowerPC", /* 63 */ + "Firebird/SINIX-Z", /* 64 */ + "Firebird/linux Sparc", /* 65 */ +- "Firebird/linux AMD64" /* 66 */ ++ "Firebird/linux AMD64", /* 66 */ ++ ++ "Firebird/linux PPC", /* 67 */ ++ "Firebird/linux alpha" /* 68 */ + }; + + +--- firebird-1.5.1.4500/src/jrd/btr.cpp.orig 2004-08-08 14:17:42.000000000 +0200 ++++ firebird-1.5.1.4500/src/jrd/btr.cpp 2004-08-08 14:16:30.000000000 +0200 +@@ -191,7 +191,7 @@ + // + inline SLONG BTR_get_quad(const UCHAR* p) + { +-#if defined(i386) || defined(I386) || defined(_M_IX86) || defined(AMD64) ++#if defined(i386) || defined(I386) || defined(_M_IX86) || defined(AMD64) || defined(__alpha__) + // For IA32 (little-endian) this optimization is a _very_ large speed-up! + return *reinterpret_cast(p); + #else +--- firebird-1.5.1.4500/src/include/fb_types.h.orig 2004-03-29 05:49:42.000000000 +0200 ++++ firebird-1.5.1.4500/src/include/fb_types.h 2004-10-08 11:25:29.000000000 +0200 +@@ -74,7 +74,7 @@ + // Temporarly restrict new definition until ULONG clash with Windows + // type is solved. Win64 port is not possible before that point. + // Cannot use SIZEOF_LONG define here because we are in a public header +-#if defined(_LP64) || defined(__LP64__) || defined(__arch64__) ++#if defined(_LP64) || defined(__LP64__) || defined(__arch64__) || defined(__alpha__) + /* EKU: Firebird requires (S)LONG to be 32 bit */ + # define LONG_DEFINED + typedef int SLONG;