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

Proposed by Tomislav Plavcic
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 688
Proposed branch: lp://qastaging/~tplavcic/percona-server/ps-bld138-5.5
Merge into: lp://qastaging/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://qastaging/~tplavcic/percona-server/ps-bld138-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+228999@code.qastaging.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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches