From 88c53601c2497e95f16fed302df8d86bb4e1e483 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Fri, 7 May 2004 22:03:28 +0000
Subject: [PATCH] - hack to build on amd64 (--with-named-thread-libs is not
 enough) - sorted configure options, release 2

Changed files:
    mysql.spec -> 1.204
---
 mysql.spec | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/mysql.spec b/mysql.spec
index a0b3971..009eb4e 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -13,7 +13,7 @@ Summary(zh_CN):	MySQL
 Name:		mysql
 Group:		Applications/Databases
 Version:	4.0.18
-Release:	1
+Release:	2
 License:	GPL/LGPL
 Source0:	http://sunsite.icm.edu.pl/mysql/Downloads/MySQL-4.0/mysql-%{version}.tar.gz
 # Source0-md5:	702151a3e21d9e5f32e8850032aefdad
@@ -348,6 +348,8 @@ Podr
 %patch9 -p1
 %patch10 -p1
 
+%{__perl} -pi -e 's@/lib/libpthread@/%{_lib}/libpthread@' configure.in
+
 %build
 %{__libtoolize}
 %{__aclocal}
@@ -361,26 +363,26 @@ CFLAGS="%{rpmcflags} %{!?debug:-fomit-frame-pointer}"
 	KILL='/bin/kill' \
 	CHECK_PID='/bin/kill -0 $$PID' \
 	-C \
-	--with-pthread \
-	--with-raid \
-	--with-unix-socket-path=/var/lib/mysql/mysql.sock \
-	--with-mysqld-user=mysql \
-	--with-libwrap \
-	--with%{!?debug:out}-debug \
+	--enable-assembler \
+	--enable-shared \
+	--enable-static \
+	--enable-thread-safe-client \
 	%{?with_bdb:--with-berkeley-db} \
+	--with-comment="PLD Linux Distribution MySQL RPM" \
+	--with%{!?debug:out}-debug \
 	--with-embedded-server \
-	--with-vio \
-	--with-openssl \
 	--with-extra-charsets=all \
-	--enable-shared \
-	--enable-static \
+	--with-libwrap \
+	--with-low-memory \
+	--with-mysqld-user=mysql \
 	--with-named-curses-libs="-lncurses" \
-	--enable-assembler \
+	--with-openssl \
+	--with-pthread \
+	--with-raid \
+	--with-unix-socket-path=/var/lib/mysql/mysql.sock \
+	--with-vio \
 	--without-readline \
-	--without-docs \
-	--with-low-memory  \
-	--with-comment="PLD Linux Distribution MySQL RPM" \
-	--enable-thread-safe-client
+	--without-docs
 #	--with-mysqlfs
 
 echo -e "all:\ninstall:\nclean:\nlink_sources:\n" > libmysqld/examples/Makefile
-- 
2.44.0