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

Proposed by Tomislav Plavcic on 2014-07-31
Status: Merged
Approved by: Laurynas Biveinis on 2014-07-31
Approved revision: 672
Merged at revision: 688
Proposed branch: lp:~tplavcic/percona-server/ps-bld138-5.5
Merge into: lp:percona-server/5.5
Diff against target: 58 lines (+7/-13)
1 file modified
build-ps/build-binary.sh (+7/-13)
To merge this branch: bzr merge lp:~tplavcic/percona-server/ps-bld138-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-07-31 Approve on 2014-07-31
Review via email: mp+228999@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.
review: Approve

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-06-11 13:39:54 +0000
3+++ build-ps/build-binary.sh 2014-07-31 10:55:29 +0000
4@@ -20,6 +20,7 @@
5 DEBUG_COMMENT=''
6 WITH_JEMALLOC=''
7 WITH_SSL='/usr'
8+WITH_SSL_TYPE='system'
9 OPENSSL_INCLUDE=''
10 OPENSSL_LIBRARY=''
11 CRYPTO_LIBRARY=''
12@@ -34,7 +35,7 @@
13 if ! getopt --test
14 then
15 go_out="$(getopt --options=iqdvjt: \
16- --longoptions=i686,quiet,debug,valgrind,with-jemalloc:,with-ssl:,tag: \
17+ --longoptions=i686,quiet,debug,valgrind,with-jemalloc:,with-yassl,with-ssl:,tag: \
18 --name="$(basename "$0")" -- "$@")"
19 test $? -eq 0 || exit 1
20 eval set -- $go_out
21@@ -68,6 +69,10 @@
22 WITH_JEMALLOC="$1"
23 shift
24 ;;
25+ --with-yassl )
26+ shift
27+ WITH_SSL_TYPE="bundled"
28+ ;;
29 --with-ssl )
30 shift
31 WITH_SSL="$1"
32@@ -199,7 +204,7 @@
33 -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
34 -DWITH_EMBEDDED_SERVER=OFF \
35 -DFEATURE_SET=community \
36- -DWITH_SSL=system \
37+ -DWITH_SSL="$WITH_SSL_TYPE" \
38 -DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \
39 -DMYSQL_DATADIR="/usr/local/$PRODUCT_FULL/data" \
40 -DCOMPILATION_COMMENT="$COMMENT" \
41@@ -223,17 +228,6 @@
42
43 )
44
45- # Build UDF
46- (
47- cd "UDF"
48- autoreconf --install
49- CXX=${UDF_CXX:-g++} ./configure --includedir="$SOURCEDIR/include" \
50- --libdir="/usr/local/$PRODUCT_FULL/mysql/plugin"
51- make $MAKE_JFLAG
52- make DESTDIR="$INSTALLDIR" install
53-
54- )
55-
56 # Build jemalloc
57 if test "x$WITH_JEMALLOC" != x
58 then

Subscribers

People subscribed via source and target branches