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

Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 537
Merged at revision: 550
Proposed branch: lp:~ignacio-nin/percona-server/5.1-bug1104977
Merge into: lp:percona-server/5.1
Diff against target: 69 lines (+20/-5)
4 files modified
Percona-Server/config/ac-macros/ssl.m4 (+17/-2)
build/build-binary.sh (+1/-1)
build/debian/rules (+1/-1)
build/percona-server.spec (+1/-1)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.1-bug1104977
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+155521@code.launchpad.net
To post a comment you must log in.

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) wrote :

> 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!

Thanks for the explanations.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/config/ac-macros/ssl.m4'
2--- Percona-Server/config/ac-macros/ssl.m4 2010-06-08 21:14:18 +0000
3+++ Percona-Server/config/ac-macros/ssl.m4 2013-03-26 15:18:28 +0000
4@@ -110,9 +110,24 @@
5
6 #
7 # Try to link with openSSL libs in <location>
8+ # In 64 bit archs, try first with lib64/ in order to avoid pointless linkage
9+ # against 32 bit libraries.
10 #
11- openssl_libs="-L$location/lib/ -lssl -lcrypto"
12- MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs])
13+ if test "$target_cpu" == "x86_64"
14+ then
15+ openssl_libs="-L$location/lib64/ -lssl -lcrypto"
16+ MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs])
17+ else
18+ # So it gets set to lib/
19+ openssl_libs="no"
20+ fi
21+
22+ if test "$mysql_ssl_found" == "no"
23+ then
24+ # Now try lib/
25+ openssl_libs="-L$location/lib/ -lssl -lcrypto"
26+ MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs])
27+ fi
28
29 if test "$mysql_ssl_found" == "no"
30 then
31
32=== modified file 'build/build-binary.sh'
33--- build/build-binary.sh 2012-08-31 12:52:50 +0000
34+++ build/build-binary.sh 2013-03-26 15:18:28 +0000
35@@ -125,7 +125,7 @@
36 --with-unix-socket-path=/var/lib/mysql/mysql.sock \
37 --with-pic \
38 --with-extra-charsets=complex \
39- --with-ssl \
40+ --with-ssl=/usr \
41 --enable-thread-safe-client \
42 --enable-profiling \
43 --with-readline
44
45=== modified file 'build/debian/rules'
46--- build/debian/rules 2013-03-13 06:12:19 +0000
47+++ build/debian/rules 2013-03-26 15:18:28 +0000
48@@ -99,7 +99,7 @@
49 --with-libwrap \
50 --with-readline \
51 $(USE_STATIC_MYSQLD) \
52- --with-ssl \
53+ --with-ssl=/usr \
54 --without-docs \
55 --with-extra-charsets=all \
56 --with-plugins=partition,archive,blackhole,csv,example,federated,innodb_plugin \
57
58=== modified file 'build/percona-server.spec'
59--- build/percona-server.spec 2013-03-22 00:15:18 +0000
60+++ build/percona-server.spec 2013-03-26 15:18:28 +0000
61@@ -288,7 +288,7 @@
62 --with-pic \
63 -prefix=/usr \
64 --with-extra-charsets=complex \
65- --with-ssl \
66+ --with-ssl=/usr \
67 --exec-prefix=%{_exec_prefix} \
68 --libexecdir=%{_sbindir} \
69 --libdir=%{_libdir} \

Subscribers

People subscribed via source and target branches