Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~tplavcic/percona-server/ps-bld138-5.1 into lp:percona-server/5.1

  1. ps-bld138-5.1
  2. Merge into 5.1
Proposed by Tomislav Plavcic
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 622
Proposed branch: lp:~tplavcic/percona-server/ps-bld138-5.1
Merge into: lp:percona-server/5.1
Diff against target: 49 lines (+9/-5)
1 file modified
build/build-binary.sh (+9/-5)
To merge this branch: bzr merge lp:~tplavcic/percona-server/ps-bld138-5.1
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+228998@code.launchpad.net

Description of the change

Added option to build-binary.sh to build with yassl.

5.1 uses just --with-ssl (without path) when building with yassl
5.5 & 5.6 use --with-ssl=bundled (for yassl) and --with-ssl=system (for openssl)

Also for 5.5 it was removed "make UDF" from build-binary since it was ported to cmake (seems it was removed from 5.6 already).

It was tested with these builds:
http://jenkins.percona.com/view/TEST/job/percona-server-5.1-binaries-test-yassl/6/label_exp=centos6-64/
http://jenkins.percona.com/job/percona-server-5.5-binary-tarballs-test/label_exp=centos5-64/1/
http://jenkins.percona.com/job/percona-server-5.6-binaries-release-test/label_exp=centos6-64/8/

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 'build/build-binary.sh'
2--- build/build-binary.sh 2014-05-28 07:55:33 +0000
3+++ build/build-binary.sh 2014-07-31 10:51:26 +0000
4@@ -15,7 +15,7 @@
5 # Examine parameters
6 TARGET="$(uname -m)"
7 TARGET_CFLAGS=''
8-WITH_SSL='/usr'
9+WITH_SSL='--with-ssl=/usr'
10 TAG=''
11 #
12 COMMON_FLAGS=''
13@@ -26,7 +26,7 @@
14 # Check if we have a functional getopt(1)
15 if ! getopt --test
16 then
17- go_out="$(getopt --options="it" --longoptions=with-ssl:,tag:,i686 \
18+ go_out="$(getopt --options="it" --longoptions=with-yassl,with-ssl:,tag:,i686 \
19 --name="$(basename "$0")" -- "$@")"
20 test $? -eq 0 || exit 1
21 eval set -- $go_out
22@@ -41,9 +41,13 @@
23 TARGET="i686"
24 TARGET_CFLAGS="-m32 -march=i686"
25 ;;
26+ --with-yassl )
27+ shift
28+ WITH_SSL="--with-ssl"
29+ ;;
30 --with-ssl )
31 shift
32- WITH_SSL="$1"
33+ WITH_SSL="--with-ssl=$1"
34 shift
35 ;;
36 -t | --tag )
37@@ -153,10 +157,10 @@
38 --with-unix-socket-path=/var/lib/mysql/mysql.sock \
39 --with-pic \
40 --with-extra-charsets=complex \
41- --with-ssl="$WITH_SSL" \
42 --enable-thread-safe-client \
43 --enable-profiling \
44- --with-readline
45+ --with-readline \
46+ $WITH_SSL
47
48 make $MAKE_JFLAG VERBOSE=1
49 make DESTDIR="$INSTALLDIR" install

Subscribers

People subscribed via source and target branches