diff options
| author | Remi Collet <fedora@famillecollet.com> | 2010-12-22 08:25:37 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2010-12-22 08:25:37 +0100 |
| commit | 1d1616dee3d76ef31f01bd4423ceff3831ce855b (patch) | |
| tree | 6dfa6987aa7496d32c06518f9c3c4cb771892547 /mysql-ssl-multilib.patch | |
more work on MySQL 5.5.8
Diffstat (limited to 'mysql-ssl-multilib.patch')
| -rw-r--r-- | mysql-ssl-multilib.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/mysql-ssl-multilib.patch b/mysql-ssl-multilib.patch new file mode 100644 index 0000000..845984b --- /dev/null +++ b/mysql-ssl-multilib.patch @@ -0,0 +1,20 @@ +We can do without -L/usr/lib/, especially in 64-bit builds ... + + +diff -Naur mysql-5.1.30.orig/config/ac-macros/ssl.m4 mysql-5.1.30/config/ac-macros/ssl.m4 +--- mysql-5.1.30.orig/config/ac-macros/ssl.m4 2008-11-14 11:34:23.000000000 -0500 ++++ mysql-5.1.30/config/ac-macros/ssl.m4 2009-01-13 19:17:09.000000000 -0500 +@@ -102,7 +102,12 @@ + # + # Try to link with openSSL libs in <location> + # +- openssl_libs="-L$location/lib/ -lssl -lcrypto" ++ if test "$location" != "/usr" ++ then ++ openssl_libs="-L$location/lib/ -lssl -lcrypto" ++ else ++ openssl_libs="-lssl -lcrypto" ++ fi + MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs]) + + if test "$mysql_ssl_found" == "no" |