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

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

  1. 2.1-bug1171721
  2. Merge into 2.1
Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 558
Proposed branch: lp:~ignacio-nin/percona-xtrabackup/2.1-bug1171721
Merge into: lp:percona-xtrabackup/2.1
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.1-bug1171721
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+160534@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
=== modified file 'utils/build-binary.sh'
--- utils/build-binary.sh 2013-04-09 07:24:21 +0000
+++ utils/build-binary.sh 2013-04-24 00:53:37 +0000
@@ -86,8 +86,8 @@
86# Compilation flags86# Compilation flags
87export CC=${CC:-gcc}87export CC=${CC:-gcc}
88export CXX=${CXX:-g++}88export CXX=${CXX:-g++}
89export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer ${CFLAGS:-}"89export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DXTRABACKUP_REVISION=\\\"$REVISION\\\" ${CFLAGS:-}"
90export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions ${CXXFLAGS:-}"90export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DXTRABACKUP_REVISION=\\\"$REVISION\\\" ${CXXFLAGS:-}"
91export MAKE_JFLAG=-j491export MAKE_JFLAG=-j4
9292
93# Create a temporary working directory93# Create a temporary working directory
9494
=== modified file 'utils/build-dpkg.sh'
--- utils/build-dpkg.sh 2013-04-01 16:55:27 +0000
+++ utils/build-dpkg.sh 2013-04-24 00:53:37 +0000
@@ -73,7 +73,7 @@
73. $SOURCEDIR/VERSION73. $SOURCEDIR/VERSION
7474
75DEBIAN_VERSION="$(lsb_release -sc)"75DEBIAN_VERSION="$(lsb_release -sc)"
76REVISION="$(cd "$SOURCEDIR"; bzr log -r-1 | grep ^revno: | cut -d ' ' -f 2)"76REVISION="$(cd "$SOURCEDIR"; bzr revno)"
77FULL_VERSION="$XTRABACKUP_VERSION-$REVISION.$DEBIAN_VERSION"77FULL_VERSION="$XTRABACKUP_VERSION-$REVISION.$DEBIAN_VERSION"
7878
79# Build information79# Build information
@@ -84,8 +84,8 @@
84export MAKE_JFLAG=-j484export MAKE_JFLAG=-j4
8585
86export DEB_BUILD_OPTIONS='debug nocheck'86export DEB_BUILD_OPTIONS='debug nocheck'
87export DEB_CFLAGS_APPEND="$CFLAGS"87export DEB_CFLAGS_APPEND="$CFLAGS -DXTRABACKUP_REVISION=\\\"$REVISION\\\""
88export DEB_CXXFLAGS_APPEND="$CXXFLAGS"88export DEB_CXXFLAGS_APPEND="$CXXFLAGS -DXTRABACKUP_REVISION=\\\"$REVISION\\\""
8989
90# Build90# Build
91(91(
9292
=== modified file 'utils/build-rpm.sh'
--- utils/build-rpm.sh 2013-04-04 05:23:53 +0000
+++ utils/build-rpm.sh 2013-04-24 00:53:37 +0000
@@ -100,7 +100,7 @@
100# Build information100# Build information
101REDHAT_RELEASE="$(grep -o 'release [0-9][0-9]*' /etc/redhat-release | \101REDHAT_RELEASE="$(grep -o 'release [0-9][0-9]*' /etc/redhat-release | \
102 cut -d ' ' -f 2)"102 cut -d ' ' -f 2)"
103REVISION="$(cd "$SOURCEDIR"; bzr log -r-1 | grep ^revno: | cut -d ' ' -f 2)"103REVISION="$(cd "$SOURCEDIR"; bzr revno)"
104104
105# Fix problems in rpmbuild for rhel4: _libdir and _arch are not correctly set.105# Fix problems in rpmbuild for rhel4: _libdir and _arch are not correctly set.
106if test "x$REDHAT_RELEASE" == "x4" && test "x$TARGET_ARG" == "xi686"106if test "x$REDHAT_RELEASE" == "x4" && test "x$TARGET_ARG" == "xi686"

Subscribers

People subscribed via source and target branches