Merge lp:~ignacio-nin/percona-server/5.1-bug1104977 into lp:percona-server/5.1

[Ignacio Nin]

[Laurynas Biveinis (laurynas-biveinis)]

Perhaps the lib64 preference over lib is better solved by setting LDFLAGS in the build scripts instead of patching Autoconf macros?

review: Needs Information

[Ignacio Nin (ignacio-nin)]

> Perhaps the lib64 preference over lib is better solved by setting LDFLAGS in
> the build scripts instead of patching Autoconf macros?

Note that /usr/lib64/ will be added anyway (implicitely) to the LD search path. So in the way the file is written now, the first test, the one that checks for /usr/lib/, will always succeed and will add /usr/lib to the library path.

In the end this won't cause problems because the libraries will be rejected and the ones in /usr/lib64/ are used anyway, but no before polluting the output with many a "incompatible library" errors when trying to use /usr/lib/. So actually, unless another directory than /usr/ is used (and we use /usr), this is just a cosmetic change -- adding /usr/lib64/ to LDFLAGS wouldn't be needed.

Please advise!

[Laurynas Biveinis (laurynas-biveinis)]

Thanks for the explanations.

review: Approve

=== modified file 'Percona-Server/config/ac-macros/ssl.m4'
--- Percona-Server/config/ac-macros/ssl.m4	2010-06-08 21:14:18 +0000
+++ Percona-Server/config/ac-macros/ssl.m4	2013-03-26 15:18:28 +0000
@@ -110,9 +110,24 @@
 
   #
   # Try to link with openSSL libs in <location>
+  # In 64 bit archs, try first with lib64/ in order to avoid pointless linkage
+  # against 32 bit libraries.
   #
-  openssl_libs="-L$location/lib/ -lssl -lcrypto"
-  MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs])
+  if test "$target_cpu" == "x86_64"
+  then
+    openssl_libs="-L$location/lib64/ -lssl -lcrypto"
+    MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs])
+  else
+    # So it gets set to lib/
+    openssl_libs="no"
+  fi
+
+  if test "$mysql_ssl_found" == "no"
+  then
+    # Now try lib/
+    openssl_libs="-L$location/lib/ -lssl -lcrypto"
+    MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs])
+  fi
 
   if test "$mysql_ssl_found" == "no"
   then
 
=== modified file 'build/build-binary.sh'
--- build/build-binary.sh	2012-08-31 12:52:50 +0000
+++ build/build-binary.sh	2013-03-26 15:18:28 +0000
@@ -125,7 +125,7 @@
         --with-unix-socket-path=/var/lib/mysql/mysql.sock \
         --with-pic \
         --with-extra-charsets=complex \
-        --with-ssl \
+        --with-ssl=/usr \
         --enable-thread-safe-client \
         --enable-profiling \
         --with-readline 
 
=== modified file 'build/debian/rules'
--- build/debian/rules	2013-03-13 06:12:19 +0000
+++ build/debian/rules	2013-03-26 15:18:28 +0000
@@ -99,7 +99,7 @@
 		--with-libwrap \
 		--with-readline \
 		$(USE_STATIC_MYSQLD) \
-		--with-ssl \
+		--with-ssl=/usr \
 	    	--without-docs \
 		--with-extra-charsets=all \
 		--with-plugins=partition,archive,blackhole,csv,example,federated,innodb_plugin \
 
=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2013-03-22 00:15:18 +0000
+++ build/percona-server.spec	2013-03-26 15:18:28 +0000
@@ -288,7 +288,7 @@
 	    --with-pic \
             -prefix=/usr \
 	    --with-extra-charsets=complex \
-	    --with-ssl \
+	    --with-ssl=/usr \
             --exec-prefix=%{_exec_prefix} \
             --libexecdir=%{_sbindir} \
             --libdir=%{_libdir} \