rpms/mysqlclient14/devel my_config.h, 1.1, 1.2 mysqlclient14.spec, 1.4, 1.5
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Dec 15 19:43:16 UTC 2005
- Previous message (by thread): rpms/postgresql/devel Makefile.regress, 1.1, 1.2 pg_config.h, 1.1, 1.2 postgresql.spec, 1.60, 1.61
- Next message (by thread): rpms/mysqlclient10/devel my_config.h, 1.1, 1.2 mysqlclient10.spec, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tgl
Update of /cvs/dist/rpms/mysqlclient14/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv305
Modified Files:
my_config.h mysqlclient14.spec
Log Message:
fix my_config.h for 64-bit and ppc platforms
Index: my_config.h
===================================================================
RCS file: /cvs/dist/rpms/mysqlclient14/devel/my_config.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- my_config.h 14 Dec 2005 23:35:10 -0000 1.1
+++ my_config.h 15 Dec 2005 19:43:13 -0000 1.2
@@ -7,24 +7,18 @@
* Note: this may well fail if user tries to use gcc's -I- option.
* But that option is deprecated anyway.
*/
-#ifdef __i386__
-#include "my_config_i386.h"
-#endif
-#ifdef __x86_64__
+#if defined(__x86_64__)
#include "my_config_x86_64.h"
-#endif
-#ifdef __ia64__
+#elif defined(__ia64__)
#include "my_config_ia64.h"
-#endif
-#ifdef __ppc__
-#include "my_config_ppc.h"
-#endif
-#ifdef __ppc64__
+#elif defined(__i386__)
+#include "my_config_i386.h"
+#elif defined(__ppc64__) || defined(__powerpc64__)
#include "my_config_ppc64.h"
-#endif
-#ifdef __s390__
-#include "my_config_s390.h"
-#endif
-#ifdef __s390x__
+#elif defined(__ppc__) || defined(__powerpc__)
+#include "my_config_ppc.h"
+#elif defined(__s390x__)
#include "my_config_s390x.h"
+#elif defined(__s390__)
+#include "my_config_s390.h"
#endif
Index: mysqlclient14.spec
===================================================================
RCS file: /cvs/dist/rpms/mysqlclient14/devel/mysqlclient14.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mysqlclient14.spec 15 Dec 2005 04:55:27 -0000 1.4
+++ mysqlclient14.spec 15 Dec 2005 19:43:13 -0000 1.5
@@ -1,6 +1,6 @@
Name: mysqlclient14
Version: 4.1.14
-Release: 3
+Release: 4
Summary: Backlevel MySQL shared libraries.
License: GPL
Group: Applications/Databases
@@ -158,6 +158,9 @@
%{_libdir}
%changelog
+* Thu Dec 15 2005 Tom Lane <tgl at redhat.com> 4.1.14-4
+- fix my_config.h for 64-bit and ppc platforms
+
* Wed Dec 14 2005 Tom Lane <tgl at redhat.com> 4.1.14-3
- oops, looks like we want uname -i not uname -m
- Previous message (by thread): rpms/postgresql/devel Makefile.regress, 1.1, 1.2 pg_config.h, 1.1, 1.2 postgresql.spec, 1.60, 1.61
- Next message (by thread): rpms/mysqlclient10/devel my_config.h, 1.1, 1.2 mysqlclient10.spec, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list