Percona XtraBackup moved to https://jira.percona.com/projects/PXB

Merge lp:~ignacio-nin/percona-xtrabackup/2.0-bug1171721 into lp:percona-xtrabackup/2.0

  1. 2.0-bug1171721
  2. Merge into 2.0
Proposed by Ignacio Nin
Status: Merged
Approved by: Alexey Kopytov
Approved revision: 533
Merged at revision: 539
Proposed branch: lp:~ignacio-nin/percona-xtrabackup/2.0-bug1171721
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 51 lines (+6/-6)
3 files modified
utils/build-binary.sh (+2/-2)
utils/build-dpkg.sh (+3/-3)
utils/build-rpm.sh (+1/-1)
To merge this branch: bzr merge lp:~ignacio-nin/percona-xtrabackup/2.0-bug1171721
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+160533@code.launchpad.net

Description of the change

Fix for bug #1171721

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utils/build-binary.sh'
2--- utils/build-binary.sh 2013-03-21 09:01:29 +0000
3+++ utils/build-binary.sh 2013-04-24 00:52:30 +0000
4@@ -86,8 +86,8 @@
5 # Compilation flags
6 export CC=${CC:-gcc}
7 export CXX=${CXX:-g++}
8-export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer ${CFLAGS:-}"
9-export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions ${CXXFLAGS:-}"
10+export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DXTRABACKUP_REVISION=\\\"$REVISION\\\" ${CFLAGS:-}"
11+export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DXTRABACKUP_REVISION=\\\"$REVISION\\\" ${CXXFLAGS:-}"
12 export MAKE_JFLAG=-j4
13
14 # Create a temporary working directory
15
16=== modified file 'utils/build-dpkg.sh'
17--- utils/build-dpkg.sh 2013-04-01 16:55:27 +0000
18+++ utils/build-dpkg.sh 2013-04-24 00:52:30 +0000
19@@ -73,7 +73,7 @@
20 . $SOURCEDIR/VERSION
21
22 DEBIAN_VERSION="$(lsb_release -sc)"
23-REVISION="$(cd "$SOURCEDIR"; bzr log -r-1 | grep ^revno: | cut -d ' ' -f 2)"
24+REVISION="$(cd "$SOURCEDIR"; bzr revno)"
25 FULL_VERSION="$XTRABACKUP_VERSION-$REVISION.$DEBIAN_VERSION"
26
27 # Build information
28@@ -84,8 +84,8 @@
29 export MAKE_JFLAG=-j4
30
31 export DEB_BUILD_OPTIONS='debug nocheck'
32-export DEB_CFLAGS_APPEND="$CFLAGS"
33-export DEB_CXXFLAGS_APPEND="$CXXFLAGS"
34+export DEB_CFLAGS_APPEND="$CFLAGS -DXTRABACKUP_REVISION=\\\"$REVISION\\\""
35+export DEB_CXXFLAGS_APPEND="$CXXFLAGS -DXTRABACKUP_REVISION=\\\"$REVISION\\\""
36
37 # Build
38 (
39
40=== modified file 'utils/build-rpm.sh'
41--- utils/build-rpm.sh 2013-04-04 05:23:53 +0000
42+++ utils/build-rpm.sh 2013-04-24 00:52:30 +0000
43@@ -100,7 +100,7 @@
44 # Build information
45 REDHAT_RELEASE="$(grep -o 'release [0-9][0-9]*' /etc/redhat-release | \
46 cut -d ' ' -f 2)"
47-REVISION="$(cd "$SOURCEDIR"; bzr log -r-1 | grep ^revno: | cut -d ' ' -f 2)"
48+REVISION="$(cd "$SOURCEDIR"; bzr revno)"
49
50 # Fix problems in rpmbuild for rhel4: _libdir and _arch are not correctly set.
51 if test "x$REDHAT_RELEASE" == "x4" && test "x$TARGET_ARG" == "xi686"

Subscribers

People subscribed via source and target branches