Permalink
Browse files

Use MySQL 5.5

MySQL 5.1 didn't compile using clang, so bump the version to the latest 5.5
The MySQL build script relies on CMake, so add it to the list of dependencies
  • Loading branch information...
1 parent 9587925 commit 214beeb6ca788021481300542495c41c7efd907b @jyavenard jyavenard committed Aug 3, 2012
Showing with 23 additions and 8 deletions.
  1. +23 −8 OSX/build/osx-packager-qtsdk.pl
@@ -67,10 +67,12 @@
'mythtv'
=> [
'ccache',
+ 'libtool',
'pkgconfig',
'dvdcss',
'freetype',
'lame',
+ 'cmake',
'mysqlclient',
#'dbus',
'qt',
@@ -100,10 +102,12 @@
'mythtv'
=> [
'ccache',
+ 'libtool',
'pkgconfig',
'dvdcss',
'freetype',
'lame',
+ 'cmake',
'mysqlclient',
#'dbus',
'qt',
@@ -133,10 +137,12 @@
'mythtv'
=> [
'ccache',
+ 'libtool',
'pkgconfig',
'dvdcss',
'freetype',
'lame',
+ 'cmake',
'mysqlclient',
#'dbus',
'qt',
@@ -166,10 +172,12 @@
'mythtv'
=> [
'ccache',
+ 'libtool',
'pkgconfig',
'dvdcss',
'freetype',
'lame',
+ 'cmake',
'mysqlclient',
#'dbus',
'qt',
@@ -933,13 +941,14 @@ END
'mysqlclient' =>
{
- 'url' => 'http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.56.tar.gz',
- 'conf' => [
- '--without-debug',
- '--without-docs',
- '--without-man',
- '--without-server',
- '--without-geometry',
+ 'url' => 'http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.24.tar.gz',
+ 'conf-cmd' => "rm -rf $PREFIX/include/mysql ; $PREFIX/bin/cmake",
+ 'conf' => [
+ "-DCMAKE_INSTALL_PREFIX=$PREFIX",
+ ],
+ 'make' => [
+ 'mysqlclient',
+ 'libmysql',
],
},
@@ -1115,9 +1124,15 @@ END
'make' => [ ],
},
+ #mysql 5.5.24 required cmake 2.8.7 and choke with 2.8.8
'cmake' =>
{
- 'url' => 'http://www.cmake.org/files/v2.8/cmake-2.8.7.tar.gz',
+ 'url' => 'http://www.cmake.org/files/v2.8/cmake-2.8.7.tar.gz',
+ 'conf-cmd' => "./configure",
+ 'conf' => [
+ "--prefix=$PREFIX",
+ ],
+ 'parallel-make' => 'yes'
},
'libtool' =>

0 comments on commit 214beeb

Please sign in to comment.