|
|
@@ -28,7 +28,7 @@ Packager: tomop
|
|
|
Name: MySQL
|
|
|
Summary: MySQL: a very fast and reliable SQL database server
|
|
|
Version: %{mysql_version}
|
|
|
-Release: 2%{_dist_release}
|
|
|
+Release: 3%{_dist_release}
|
|
|
|
|
|
Group: Applications/Databases
|
|
|
# exceptions allow client libraries to be linked with most open source SW,
|
|
|
@@ -41,6 +41,9 @@ Source: mysql-%{version}.tar.gz
|
|
|
Source999: filter-requires-%{name}.sh
|
|
|
Patch0: mysql-5.1.44-jp-all.patch
|
|
|
|
|
|
+# lib64 patch for vine
|
|
|
+Patch200: pysql-5.1.44-lib64.patch
|
|
|
+
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: perl, readline-devel
|
|
|
BuildRequires: gcc-c++, ncurses-devel, zlib-devel
|
|
|
@@ -221,6 +224,9 @@ mv mysql-%{mysql_version} mysql-debug-%{mysql_version}
|
|
|
|
|
|
pushd mysql-debug-%{mysql_version}
|
|
|
%patch0 -p1 -b .jp
|
|
|
+%if %{_lib} == lib64
|
|
|
+%patch200 -p0 -b .lib64
|
|
|
+%endif
|
|
|
aclocal
|
|
|
autoheader
|
|
|
libtoolize --automake --force
|
|
|
@@ -233,6 +239,9 @@ mv mysql-%{mysql_version} mysql-release-%{mysql_version}
|
|
|
|
|
|
pushd mysql-release-%{mysql_version}
|
|
|
%patch0 -p1 -b .jp
|
|
|
+%if %{_lib} == lib64
|
|
|
+%patch200 -p0 -b .lib64
|
|
|
+%endif
|
|
|
aclocal
|
|
|
autoheader
|
|
|
libtoolize --automake --force
|
|
|
@@ -248,8 +257,13 @@ BuildMySQL() {
|
|
|
sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
|
|
|
CC=\"${CC:-$MYSQL_BUILD_CC}\" \
|
|
|
CXX=\"${CXX:-$MYSQL_BUILD_CXX}\" \
|
|
|
+%ifarch x86_64
|
|
|
+ CFLAGS=\"$CFLAGS -fPIC\" \
|
|
|
+ CXXFLAGS=\"$CXXFLAGS -fPIC\" \
|
|
|
+%else
|
|
|
CFLAGS=\"$CFLAGS\" \
|
|
|
CXXFLAGS=\"$CXXFLAGS\" \
|
|
|
+%endif
|
|
|
LDFLAGS=\"$MYSQL_BUILD_LDFLAGS\" \
|
|
|
./configure \
|
|
|
$* \
|
|
|
@@ -785,6 +799,10 @@ fi
|
|
|
%{_mandir}/man1/mysqltest_embedded.1*
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Oct 29 2010 Shu KONNO <owa@bg.wakwak.com> 5.1.44-3
|
|
|
+- added mysql-5.1.44-lib64.patch (on x86_64)
|
|
|
+- added -fPIC (on x86_64)
|
|
|
+
|
|
|
* Sun Oct 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 5.1.44-2
|
|
|
- made embedded package again
|
|
|
|
owa