rpms/firebird/devel firebird-s390x.patch, NONE, 1.1 firebird.spec, 1.9, 1.10

Sat Sep 5 13:32:08 UTC 2009

Author: karsten

Update of /cvs/extras/rpms/firebird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16204

Modified Files:
	firebird.spec 
Added Files:
	firebird-s390x.patch 
Log Message:
- fix build on s390x for F-12 mass rebuild (Dan Horák)



firebird-s390x.patch:
 builds/posix/prefix.linux_s390x |   31 +++++++++++++++++++++++++++++++
 configure.in                    |   10 ++++++++++
 src/jrd/common.h                |    4 ++++
 src/jrd/inf_pub.h               |    1 +
 src/jrd/pag.cpp                 |    8 ++++++--
 src/jrd/utl.cpp                 |    3 ++-
 src/remote/xdr.cpp              |    2 +-
 7 files changed, 55 insertions(+), 4 deletions(-)

--- NEW FILE firebird-s390x.patch ---
diff -up Firebird-2.1.3.18185-0/builds/posix/prefix.linux_s390x.s390x Firebird-2.1.3.18185-0/builds/posix/prefix.linux_s390x
--- Firebird-2.1.3.18185-0/builds/posix/prefix.linux_s390x.s390x	2009-09-04 17:27:31.000000000 -0400
+++ Firebird-2.1.3.18185-0/builds/posix/prefix.linux_s390x	2009-09-04 17:27:31.000000000 -0400
@@ -0,0 +1,31 @@
+# The contents of this file are subject to the Interbase Public
+# License Version 1.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy
+# of the License at http://www.Inprise.com/IPL.html
+#
+# Software distributed under the License is distributed on an
+# "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
+# or implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code was created by Inprise Corporation
+# and its predecessors. Portions created by Inprise Corporation are
+# Copyright (C) Inprise Corporation.
+#
+# All Rights Reserved.
+# Contributor(s): ______________________________________.
+# Start of file prefix.linux:	$(VERSION)	$(PLATFORM)
+#
+# 3. Sep 2009 Karsten Hopp     - initial verion
+
+COMMON_FLAGS=-m64 -DLINUX -pipe -MMD -fPIC -DS390X -DFB_SEND_FLAGS=MSG_NOSIGNAL -fmessage-length=0 -fsigned-char
+PROD_FLAGS=-ggdb -march=z9-109 -mtune=z10 -O2 -DNDEBUG $(COMMON_FLAGS)
+DEV_FLAGS=-ggdb -p -Wall -Wno-switch  $(COMMON_FLAGS)
+CXXFLAGS:= $(CXXFLAGS) -fno-rtti
+
+OS_ServerFiles=inet_server.cpp
+
+EMBED_UTIL_TARGETS=gstat gds_drop gsec nbackup fb_lock_print fbsvcmgr
+CLIENT_UTIL_TARGETS=gds_drop gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr
+
+Physical_IO_Module=os/posix/unix.cpp
diff -up Firebird-2.1.3.18185-0/configure.in.s390x Firebird-2.1.3.18185-0/configure.in
--- Firebird-2.1.3.18185-0/configure.in.s390x	2009-09-04 18:33:27.000000000 -0400
+++ Firebird-2.1.3.18185-0/configure.in	2009-09-04 18:33:37.000000000 -0400
@@ -182,6 +182,16 @@ dnl CPU_TYPE=ppc64
     SHRLIB_EXT=so
     ;;
 
+  s390x-*-linux*)
+    MAKEFILE_PREFIX=linux_s390x
+    INSTALL_PREFIX=linux
+    PLATFORM=LINUX
+    AC_DEFINE(LINUX, 1, [Define this if OS is Linux])
+    LOCK_MANAGER_FLG=Y
+    EDITLINE_FLG=Y
+    SHRLIB_EXT=so
+    ;;
+
   powerpc*-*-linux*)
     MAKEFILE_PREFIX=linux_powerpc
     INSTALL_PREFIX=linux
diff -up Firebird-2.1.3.18185-0/src/jrd/common.h.s390x Firebird-2.1.3.18185-0/src/jrd/common.h
--- Firebird-2.1.3.18185-0/src/jrd/common.h.s390x	2008-12-23 03:34:32.000000000 -0500
+++ Firebird-2.1.3.18185-0/src/jrd/common.h	2009-09-04 17:27:31.000000000 -0400
@@ -151,6 +151,10 @@
 #define RISC_ALIGNMENT
 #endif // IA64
 
+#ifdef S390X
+#define IMPLEMENTATION  isc_info_db_impl_linux_s390x /* 78  */
+#endif /* s390x */
+
 #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))
diff -up Firebird-2.1.3.18185-0/src/jrd/inf_pub.h.s390x Firebird-2.1.3.18185-0/src/jrd/inf_pub.h
--- Firebird-2.1.3.18185-0/src/jrd/inf_pub.h.s390x	2008-06-09 07:16:32.000000000 -0400
+++ Firebird-2.1.3.18185-0/src/jrd/inf_pub.h	2009-09-04 17:27:31.000000000 -0400
@@ -207,6 +207,7 @@ enum  info_db_implementations
 	isc_info_db_impl_linux_ia64 = 76,
 
 	isc_info_db_impl_darwin_ppc64 = 77,
+	isc_info_db_impl_linux_s390x = 78,
 
 	isc_info_db_impl_last_value   // Leave this LAST!
 };
diff -up Firebird-2.1.3.18185-0/src/jrd/pag.cpp.s390x Firebird-2.1.3.18185-0/src/jrd/pag.cpp
--- Firebird-2.1.3.18185-0/src/jrd/pag.cpp.s390x	2009-01-06 16:25:22.000000000 -0500
+++ Firebird-2.1.3.18185-0/src/jrd/pag.cpp	2009-09-04 17:27:31.000000000 -0400
@@ -160,9 +160,10 @@ static const int CLASS_SOLARIS_AMD64 = 3
 static const int CLASS_LINUX_ARM = 33;    // LINUX/ARM
 static const int CLASS_LINUX_IA64 = 34;    // LINUX/IA64
 static const int CLASS_DARWIN_PPC64 = 35; // Darwin/PowerPC64
+static const int CLASS_LINUX_S390X = 36;    // LINUX/s390x
 
 static const int CLASS_MAX10 = CLASS_LINUX_AMD64;	// This should not be changed, no new ports with ODS10
-static const int CLASS_MAX = CLASS_DARWIN_PPC64;
+static const int CLASS_MAX = CLASS_LINUX_S390X;
 
 // ARCHITECTURE COMPATIBILITY CLASSES
 
@@ -253,7 +254,8 @@ static ArchitectureType archMatrix[CLASS
 	archLittleEndian, // CLASS_SOLARIS_AMD64
 	archLittleEndian, // CLASS_LINUX_ARM
 	archLittleEndian, // CLASS_LINUX_IA64
-	archBigEndian	  // CLASS_DARWIN_PPC64
+	archBigEndian,	  // CLASS_DARWIN_PPC64
+	archBigEndian     // CLASS_LINUX_S390X
 };
 
 #ifdef sun
@@ -311,6 +313,8 @@ const SSHORT CLASS		= CLASS_LINUX_MIPSEL
 const SSHORT CLASS		= CLASS_LINUX_MIPS;
 #elif defined(IA64)
 const SSHORT CLASS		= CLASS_LINUX_IA64;
+#elif defined(S390X)
+const SSHORT CLASS		= CLASS_LINUX_S390X;
 #else
 #error no support on other hardware for Linux
 #endif
diff -up Firebird-2.1.3.18185-0/src/jrd/utl.cpp.s390x Firebird-2.1.3.18185-0/src/jrd/utl.cpp
--- Firebird-2.1.3.18185-0/src/jrd/utl.cpp.s390x	2008-12-10 10:22:17.000000000 -0500
+++ Firebird-2.1.3.18185-0/src/jrd/utl.cpp	2009-09-04 18:31:07.000000000 -0400
@@ -244,7 +244,8 @@ static const TEXT* const impl_implementa
     "Firebird/sun/amd64",	/* 74 */	
     "Firebird/linux ARM",	/* 75 */
     "Firebird/linux IA64",	/* 76 */
-	"Firebird/Darwin/PowerPC64"	/* 77 */
+	"Firebird/Darwin/PowerPC64",	/* 77 */
+    "Firebird/linux S390X"	/* 78 */
 };
 
 
diff -up Firebird-2.1.3.18185-0/src/remote/xdr.cpp.s390x Firebird-2.1.3.18185-0/src/remote/xdr.cpp
--- Firebird-2.1.3.18185-0/src/remote/xdr.cpp.s390x	2008-06-09 07:16:44.000000000 -0400
+++ Firebird-2.1.3.18185-0/src/remote/xdr.cpp	2009-09-04 17:27:31.000000000 -0400
@@ -45,7 +45,7 @@
 // ASF: Currently, all little-endian are SWAP_DOUBLE and big-endian aren't.
 #if defined(i386) || defined(I386) || defined(_M_IX86) || defined(AMD64) || defined(ARM) || defined(MIPSEL) || defined(DARWIN64) || defined(IA64)
 #define		SWAP_DOUBLE
-#elif defined(sparc) || defined(PowerPC) || defined(PPC) || defined(__ppc__) || defined(HPUX) || defined(MIPS) || defined(__ppc64__)
+#elif defined(sparc) || defined(PowerPC) || defined(PPC) || defined(__ppc__) || defined(HPUX) || defined(MIPS) || defined(__ppc64__) || defined(S390X) || defined(__s390x__)
 #undef		SWAP_DOUBLE
 #else
 #error "Define SWAP_DOUBLE for your platform correctly !"


Index: firebird.spec
===================================================================
RCS file: /cvs/extras/rpms/firebird/devel/firebird.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- firebird.spec	10 Aug 2009 22:44:03 -0000	1.9
+++ firebird.spec	5 Sep 2009 13:32:08 -0000	1.10
@@ -6,7 +6,7 @@
 Summary:	SQL relational database management system
 Name:		firebird
 Version:	2.1.3.18185.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 
 Group:		Applications/Databases
 License:	Interbase
@@ -23,6 +23,7 @@ Patch1:		firebird-edit-fix.patch
 Patch2:		firebird-fix-initscript.patch
 Patch3:		firebird_lock-file-location.patch
 Patch4:		firebird-gcc-icu.patch
+Patch5:		firebird-s390x.patch
 
 
 BuildRequires:	autoconf
@@ -134,6 +135,7 @@ iconv	-f	ISO-8859-1	-t	utf-8	-c	./doc/RE
 %patch0
 %patch3
 %patch4
+%patch5 -p1
 
 %build
 
@@ -533,6 +535,9 @@ fi
 
 
 %changelog
+* Sat Sep 05 2009 Karsten Hopp <karsten at redhat.com> 2.1.3.18185.0-5
+- fix build on s390x for F-12 mass rebuild (Dan Horák)
+
 * Mon Aug 11 2009  Philippe Makowski <makowski at fedoraproject.org> 2.1.3.18185.0-4
 - build it against system edit lib
 - set correct setuid for Classic lock manager


