Merge lp:~tplavcic/percona-server/bld-224-5.5 into lp:percona-server/5.5

Proposed by Tomislav Plavcic on 2014-11-06
Status: Rejected
Rejected by: Tomislav Plavcic on 2014-11-06
Proposed branch: lp:~tplavcic/percona-server/bld-224-5.5
Merge into: lp:percona-server/5.5
Diff against target: 33 lines (+14/-2)
1 file modified
build-ps/build-binary.sh (+14/-2)
To merge this branch: bzr merge lp:~tplavcic/percona-server/bld-224-5.5
Reviewer Review Type Date Requested Status
Registry Administrators 2014-11-06 Pending
Review via email: mp+240895@code.launchpad.net

Description of the change

Needed to fix build-binary.sh for debug build mostly for tokudb mtr runs (but made changes for 5.5 also).
Added WITH_DEBUG=ON and fixed flags for 32bit.

Runned test builds here:
http://jenkins.percona.com/view/TEST/job/percona-server-5.6-binaries-debug-yassl-test/17/
http://jenkins.percona.com/view/TEST/job/percona-server-5.5-binary-tarballs-debug-test/4/

To post a comment you must log in.

Unmerged revisions

699. By Tomislav Plavcic on 2014-11-21

Added WITH_DEBUG=ON in build-binary for debug build

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build-ps/build-binary.sh'
2--- build-ps/build-binary.sh 2014-09-30 11:58:25 +0000
3+++ build-ps/build-binary.sh 2014-11-06 16:36:27 +0000
4@@ -53,6 +53,7 @@
5 -d | --debug )
6 shift
7 CMAKE_BUILD_TYPE='Debug'
8+ CMAKE_OPTS="${CMAKE_OPTS:-} -DWITH_DEBUG=ON"
9 BUILD_COMMENT="${BUILD_COMMENT:-}-debug"
10 ;;
11 -v | --valgrind )
12@@ -170,8 +171,19 @@
13 export CXX=${CXX:-g++}
14
15 #
16-if [ -n "$(which rpm)" ]; then
17- export COMMON_FLAGS=$(rpm --eval %optflags | sed -e "s|march=i386|march=i686|g")
18+if test "x$CMAKE_BUILD_TYPE" != "xDebug"
19+then
20+ if [ -n "$(which rpm)" ]; then
21+ export COMMON_FLAGS=$(rpm --eval %optflags | sed -e "s|march=i386|march=i686|g")
22+ fi
23+else
24+ set +e
25+ echo `uname -m` | grep 'i.86' 2>&1 >/dev/null
26+ if [ "$?" = "0" ]; then
27+ CPU_ARCH=i686
28+ COMMON_FLAGS="$COMMON_FLAGS -march=$CPU_ARCH"
29+ fi
30+ set -e
31 fi
32 #
33 export CFLAGS="${COMMON_FLAGS} -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"

Subscribers

People subscribed via source and target branches