rpms/mysqlclient10/devel mysql-no-atomic.patch, NONE, 1.1 mysqlclient10.spec, 1.6, 1.7

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/mysqlclient10/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28466

Modified Files:
	mysqlclient10.spec 
Added Files:
	mysql-no-atomic.patch 
Log Message:
Rebuild forced by recent changes to glibc thread support --- previous
source did not build anymore.

mysql-no-atomic.patch:
 Docs/Makefile.am |    2 +-
 configure.in     |   33 ---------------------------------
 2 files changed, 1 insertion(+), 34 deletions(-)

--- NEW FILE mysql-no-atomic.patch ---
The idea of userland using <asm/atomic.h> has our kernel hackers all bent
out of shape, so don't do it.  Suppressing this has another benefit too,
which is we avoid the 4-vs-8-byte problem in BDB that formerly required
mysql-threads.patch.

If you're wondering about the hack on Docs/Makefile.am, it's to prevent
it from deciding we need to rebuild the docs after patching configure.in.


diff -Naur mysql-3.23.58.orig/configure.in mysql-3.23.58/configure.in
--- mysql-3.23.58.orig/configure.in	2003-09-11 07:49:20.000000000 -0400
+++ mysql-3.23.58/configure.in	2005-04-08 19:08:35.814502085 -0400
@@ -762,39 +762,6 @@
 ])
 AC_SUBST(WRAPLIBS)
 
-if test "$IS_LINUX" = "true"; then
-  AC_MSG_CHECKING([for atomic operations])
-
-  atom_ops=
-  AC_TRY_RUN([
-#include <asm/atomic.h>
-int main()
-{
-  atomic_t v;
-
-  atomic_set(&v, 23);
-  atomic_add(5, &v);
-  return atomic_read(&v) == 28 ? 0 : -1;
-}
-  ], AC_DEFINE(HAVE_ATOMIC_ADD) atom_ops="${atom_ops}atomic_add ",
-  )
-  AC_TRY_RUN([
-#include <asm/atomic.h>
-int main()
-{
-  atomic_t v;
-
-  atomic_set(&v, 23);
-  atomic_sub(5, &v);
-  return atomic_read(&v) == 18 ? 0 : -1;
-}
-  ], AC_DEFINE(HAVE_ATOMIC_SUB) atom_ops="${atom_ops}atomic_sub ",
-  )
-
-  if test -z "$atom_ops"; then atom_ops="no"; fi
-  AC_MSG_RESULT($atom_ops)
-fi
-
 # Check for gtty if termio.h doesn't exists
 if test "$ac_cv_header_termio_h" = "no" -a "$ac_cv_header_termios_h" = "no"
 then
diff -Naur mysql-3.23.58.orig/Docs/Makefile.am mysql-3.23.58/Docs/Makefile.am
--- mysql-3.23.58.orig/Docs/Makefile.am	2003-09-11 07:49:19.000000000 -0400
+++ mysql-3.23.58/Docs/Makefile.am	2005-04-08 19:08:48.714742602 -0400
@@ -38,7 +38,7 @@
 #########################################################################
 
 # The Makefile contains the previous version so we can not use that
-include.texi:	../configure.in
+include.texi:
 	echo "@c This file is autogenerated by the Makefile" > $@
 	echo -n "@set mysqlversion " >> $@
 	grep "AM_INIT_AUTOMAKE(mysql, " ../configure.in | \


Index: mysqlclient10.spec
===================================================================
RCS file: /cvs/dist/rpms/mysqlclient10/devel/mysqlclient10.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mysqlclient10.spec	6 Mar 2005 20:33:34 -0000	1.6
+++ mysqlclient10.spec	8 Apr 2005 23:32:40 -0000	1.7
@@ -1,6 +1,6 @@
 Name: mysqlclient10
 Version: 3.23.58
-Release: 5
+Release: 6
 Source0: http://www.mysql.com/Downloads/MySQL-3.23/mysql-%{version}.tar.gz
 # Working around perl dependency checking bug in rpm FTTB. Remove later.
 Source999: filter-requires-mysql.sh 
@@ -8,6 +8,7 @@
 Patch2: mysql-errno.patch
 Patch8: mysql-3.23.58-config.patch
 Patch9: mysql-3.23.58-security.patch
+Patch10: mysql-no-atomic.patch
 URL: http://www.mysql.com
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Summary: Backlevel MySQL shared libraries.
@@ -52,6 +53,7 @@
 %patch2 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 libtoolize --force
 aclocal
@@ -82,7 +84,8 @@
 	--with-extra-charsets=all \
 	--enable-local-infile \
 	--enable-large-files=yes --enable-largefile=yes \
-	--enable-thread-safe-client
+	--enable-thread-safe-client \
+	--with-named-thread-libs="-lpthread"
 
 make %{?_smp_mflags}
 make check
@@ -139,6 +142,10 @@
 %{_libdir}
 
 %changelog
+* Fri Apr  8 2005 Tom Lane <tgl at redhat.com> 3.23.58-6
+- Avoid dependency on <asm/atomic.h>, cause it won't build anymore on ia64.
+- Override configure thread library test to suppress HAVE_LINUXTHREADS check
+
 * Sun Mar  6 2005 Tom Lane <tgl at redhat.com> 3.23.58-5
 - Rebuild with gcc4.