Merge lp:~ignacio-nin/percona-server/5.6-bug1174300 into lp:percona-server/5.6

[Ignacio Nin]

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'build/build-rpm.sh'
--- build/build-rpm.sh	2013-06-25 13:13:06 +0000
+++ build/build-rpm.sh	2013-09-27 21:01:53 +0000
@@ -136,11 +136,6 @@
     # Execute clean and download mysql, apply patches
     make clean all
 
-    # "Fix" cmake destdirs, since we cannot alter SYSTEM_PROCESSOR
-    if test "x$TARGET" != "x"
-    then
-        sed -i 's/lib64/lib/' "$PRODUCT/cmake/install_layout.cmake"
-    fi
     # Create tarball for build
     tar czf "$WORKDIR_ABS/SOURCES/$PRODUCT.tar.gz" "$PRODUCT/"*
 

=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2013-09-25 21:16:07 +0000
+++ build/percona-server.spec	2013-09-27 21:01:53 +0000
@@ -382,6 +382,16 @@
 export CMAKE=${MYSQL_BUILD_CMAKE:-${CMAKE:-cmake}}
 export MAKE_JFLAG=${MYSQL_BUILD_MAKE_JFLAG:-${MAKE_JFLAG:-}}
 
+# "Fix" cmake directories in case we're crosscompiling.
+# We detect crosscompiles to i686 if uname is x86_64 however _libdir does not
+# contain lib64.
+# In this case, we cannot instruct cmake to change CMAKE_SYSTEM_PROCESSOR, so
+# we need to alter the directories in cmake/install_layout.cmake manually.
+if test "x$(uname -m)" = "xx86_64" && echo "%{_libdir}" | fgrep -vq lib64
+then
+    sed -i 's/lib64/lib/' "cmake/install_layout.cmake"
+fi
+
 # Build debug mysqld and libmysqld.a
 mkdir debug
 (