Merge lp:~percona-core/percona-xtrabackup/release-2.0.6 into lp:percona-xtrabackup/2.0

[Ignacio Nin]

Resubmitting the proposal with the changes required for fixing the binary issues, and also using g++ now as default C++ compiler for all versions of Percona Server.

These changes are built on top of the changes for release 2.0.6 since it's already been released.

[Alexey Kopytov (akopytov)]

Are there any specific reasons to not just use "CXX=${CXX:-g++}" instead of introducing CXX_56?

review: Needs Information

[Ignacio Nin (ignacio-nin)]

> Are there any specific reasons to not just use "CXX=${CXX:-g++}" instead of
> introducing CXX_56?

PS 5.1 and 5.5 are compiled with gcc by default, so CXX gets exported to CXX=gcc by default. However, 5.6 won't build with CXX=gcc so we need to default to CXX=g++ for it. I created CXX_56 so we can specifically override CXX for 5.6 separately from 5.5 and 5.1.

For example in CentOS 5 we want to compile 5.1 and 5.5 with CXX=gcc44, but 5.6 with CXX=g++44.

[Alexey Kopytov (akopytov)]

Hi Ignacio,

On Thu, 21 Mar 2013 21:43:20 -0000, Ignacio Nin wrote:
>> Are there any specific reasons to not just use "CXX=${CXX:-g++}" instead of
>> introducing CXX_56?
>
> PS 5.1 and 5.5 are compiled with gcc by default, so CXX gets exported to CXX=gcc by default. However, 5.6 won't build with CXX=gcc so we need to default to CXX=g++ for it. I created CXX_56 so we can specifically override CXX for 5.6 separately from 5.5 and 5.1.
>

Are you saying that PS 5.1/5.5 will *not* compile with CXX=g++? As in,
what exactly is wrong with CXX=g++? I use it locally to build XB and
don't have any issues.

[Alexey Kopytov (akopytov)]

It is in fact the reason for bug #1158948.

Our packaging scripts define CXX=gcc for some obscure reason. This worked for server versions < 5.6, but 5.6 doesn't build with CXX=gcc, it requires CXX=g++ (or just not overriding CXX, in which case CMake would use g++ anyway).

Now what the changes in release-2.0.6 do is that instead of changing CXX to g++ they introduce this CXX_56=g++ thing. But only in build-dpkg.sh and build-rpm.sh, not in build-binary.sh. And that's why innodb56 build fails when run from build-binary.sh. One would expect that build-binary.sh would fail in such a case. But we also have the code in build-binary.sh to suppress all build failures with the "( ... ) || false" construct. So build-binary.sh fails to build innodb56, but completes successfully.

Here's what I suggest we do:

- remove CXX_56, replace it with "CXX=g++" in all build-*.sh scripts
- remove that construct to suppress build failures

review: Needs Fixing

[Stewart Smith (stewart)]

review: Approve

=== modified file 'VERSION'
--- VERSION	2013-01-17 20:09:45 +0000
+++ VERSION	2013-04-02 17:36:42 +0000
@@ -1,1 +1,1 @@
-XTRABACKUP_VERSION=2.0.5
+XTRABACKUP_VERSION=2.0.6

=== modified file 'src/Makefile'
--- src/Makefile	2013-03-12 05:59:29 +0000
+++ src/Makefile	2013-04-02 17:36:42 +0000
@@ -123,7 +123,7 @@
 
 5.6: MYSQLOBJS = $(MYSQL_ROOT_DIR)/libmysqld/libmysqld.a
 ifeq ($(shell uname -s),Linux)
-5.6: LIBS += -laio -ldl -lcrypt
+5.6: LIBS += -laio -ldl -lcrypt -lssl
 endif
 5.6: TARGET := xtrabackup_56
 # In CMake server builds it is important to build with exactly the same preprocessor flags

=== modified file 'utils/build-binary.sh'
--- utils/build-binary.sh	2013-03-12 05:59:29 +0000
+++ utils/build-binary.sh	2013-04-02 17:36:42 +0000
@@ -85,7 +85,7 @@
 
 # Compilation flags
 export CC=${CC:-gcc}
-export CXX=${CXX:-gcc}
+export CXX=${CXX:-g++}
 export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer ${CFLAGS:-}"
 export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions ${CXXFLAGS:-}"
 export MAKE_JFLAG=-j4
@@ -136,17 +136,26 @@
 
         cp -R test "$INSTALLDIR/share/percona-xtrabackup-test"
 
-    ) || false
+    )
+    exit_value=$?
 
-    $TAR czf "percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION.tar.gz" \
-        --owner=0 --group=0 -C "$INSTALLDIR/../" \
-        "percona-xtrabackup-$XTRABACKUP_VERSION"
+    if test "x$exit_value" = "x0"
+    then
+        $TAR czf "percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION.tar.gz" \
+            --owner=0 --group=0 -C "$INSTALLDIR/../" \
+            "percona-xtrabackup-$XTRABACKUP_VERSION"
+    fi
 
     # Clean up build dir
     rm -rf "percona-xtrabackup-$XTRABACKUP_VERSION"
     
-) || false
+    exit $exit_value
+    
+)
+exit_value=$?
 
 # Clean up
 rm -rf "$WORKDIR_ABS/$BASEINSTALLDIR"
 
+exit $exit_value
+

=== modified file 'utils/build-dpkg.sh'
--- utils/build-dpkg.sh	2012-12-05 19:57:24 +0000
+++ utils/build-dpkg.sh	2013-04-02 17:36:42 +0000
@@ -78,7 +78,7 @@
 
 # Build information
 export CC=${CC:-gcc}
-export CXX=${CXX:-gcc}
+export CXX=${CXX:-g++}
 export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer"
 export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions"
 export MAKE_JFLAG=-j4

=== modified file 'utils/build-rpm.sh'
--- utils/build-rpm.sh	2012-03-19 16:49:12 +0000
+++ utils/build-rpm.sh	2013-04-02 17:36:42 +0000
@@ -109,7 +109,7 @@
 
 # Compilation flags
 export CC=${CC:-gcc}
-export CXX=${CXX:-gcc}
+export CXX=${CXX:-g++}
 export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer $TARGET_CFLAGS"
 export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions $TARGET_CFLAGS"
 export MAKE_JFLAG=-j4

=== modified file 'utils/xtrabackup.spec'
--- utils/xtrabackup.spec	2013-03-19 12:33:57 +0000
+++ utils/xtrabackup.spec	2013-04-02 17:36:42 +0000
@@ -58,7 +58,7 @@
 %build
 set -ue
 export CC=${CC-"gcc"}
-export CXX=$CC
+export CXX=${CXX-"g++"}
 export CFLAGS="$CFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\"" 
 export CXXFLAGS="$CXXFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\" -fno-exceptions" 
 AUTO_DOWNLOAD=yes ./utils/build.sh 5.1