* Added the MySQL ODBC connector.

* Enable unixODBC support in PHP.
* Build MySQL with thread-safe client libraries.

svn path=/nixpkgs/trunk/; revision=5045
This commit is contained in:
Eelco Dolstra 2006-03-15 15:59:20 +00:00
parent 3d24096431
commit 9f1b5e24ad
6 changed files with 43 additions and 4 deletions

View File

@ -2,7 +2,15 @@ source $stdenv/setup
alias lex=flex
configureFlags="--with-libxml-dir=$libxml2 --with-apxs2=$apacheHttpd/bin/apxs --with-apr-util=$apacheHttpd"
configureFlags="$configureFlags \
--with-libxml-dir=$libxml2 \
--with-apxs2=$apacheHttpd/bin/apxs \
--with-apr-util=$apacheHttpd"
if test -n "$unixODBC"; then
configureFlags="$configureFlags --with-unixODBC=$unixODBC"
fi
makeFlags="APXS_LIBEXECDIR=$out/modules $makeFlags"
genericBuild

View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, flex, bison, libxml2, apacheHttpd}:
{stdenv, fetchurl, flex, bison, libxml2, apacheHttpd, unixODBC ? null}:
assert libxml2 != null;
@ -11,8 +11,13 @@ stdenv.mkDerivation {
inherit flex bison libxml2 apacheHttpd;
buildInputs = [flex bison libxml2 apacheHttpd];
builder = ./builder.sh;
buildInputs = [flex bison libxml2 apacheHttpd];
inherit unixODBC;
odbcSupport = unixODBC != null;
patches = [./fix.patch];
}

View File

@ -0,0 +1,7 @@
source $stdenv/setup
configureFlags="$configureFlags \
--with-mysql-path=$mysql \
--with-unixODBC=$unixODBC"
genericBuild

View File

@ -0,0 +1,13 @@
{stdenv, fetchurl, mysql, libtool, zlib, unixODBC}:
stdenv.mkDerivation {
name = "mysql-connector-odbc-3.51.12";
builder = ./builder.sh;
src = fetchurl {
url = http://ftp.snt.utwente.nl/pub/software/mysql/Downloads/MyODBC3/mysql-connector-odbc-3.51.12.tar.gz;
md5 = "a484f590464fb823a8f821b2f1fd7fef";
};
configureFlags = "--disable-gui";
buildInputs = [libtool zlib];
inherit mysql unixODBC;
}

View File

@ -11,4 +11,6 @@ stdenv.mkDerivation {
};
buildInputs = [ps ncurses zlib perl];
configureFlags = "--enable-thread-safe-client";
}

View File

@ -808,7 +808,7 @@ rec {
};
php = (import ../development/interpreters/php) {
inherit stdenv fetchurl flex bison libxml2 apacheHttpd;
inherit stdenv fetchurl flex bison libxml2 apacheHttpd unixODBC;
};
guile = (import ../development/interpreters/guile) {
@ -1252,6 +1252,10 @@ rec {
inherit fetchurl stdenv;
};
mysqlConnectorODBC = import ../development/libraries/mysql-connector-odbc {
inherit fetchurl stdenv mysql libtool zlib unixODBC;
};
### DEVELOPMENT / LIBRARIES / JAVA
saxon = (import ../development/libraries/java/saxon) {