openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package mysql (Revision 50aeeffdf9b441d109293eb06d42c3bc)

Currently displaying revision 50aeeffdf9b441d109293eb06d42c3bc , Show latest

--- mysql.changes.orig
+++ mysql.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Wed Aug 12 13:29:09 CEST 2009 - mhrusecky@suse.cz
+
+- Using configure option to enforce pthreads rwlocks on s390 instead
+  of sed substitution 
+
+-------------------------------------------------------------------
 Tue Jul 28 17:10:31 CEST 2009 - mhrusecky@suse.cz
 
 - Applying upstream patch for upstream bug#43594
--- mysql.spec.orig
+++ mysql.spec
@@ -422,6 +422,11 @@ BuildMySQL() {
 		--with-comment="SUSE MySQL RPM" \
 		--with-libwrap \
 		--with-server-suffix=$suffix \
+%ifarch s390 s390x
+		--with-atomic-ops=rwlocks \
+%else
+		--with-atomic-ops=smp \
+%endif
 		--with-ssl=/usr \
 		--with-plugins=partition,csv,heap,myisam,ndbcluster,innobase \
 		HOSTNAME="/bin/hostname -f" \
@@ -429,12 +434,6 @@ BuildMySQL() {
 	# Add this for MyISAM RAID support:
 	# --with-raid
 	# benchdir does not fit in above model. Fix when we make a separate package
-%ifarch s390 s390x
-	# The atomic stuff doesn't work the way mySQL wants to use it
-	# on s390, and s390x, so we have to make sure, that pthreads
-	# mutexes are being used.
-	sed -i '/HAVE_ATOMIC_ADD/d; /HAVE_ATOMIC_SUB/d' config.h
-%endif
 	make %{?jobs:-j%jobs}
 	nm --numeric-sort sql/mysqld > sql/mysqld.sym
 	# needed for make check, which is not VPATH aware

Places

File project.diff of Package mysql (Revision 50aeeffdf9b441d109293eb06d42c3bc)

Places