Merge lp:~ignacio-nin/percona-server/5.5-bug1028240 into lp:percona-server/5.5

Proposed by Ignacio Nin on 2012-09-21
Status: Merged
Approved by: Alexey Kopytov on 2012-09-23
Approved revision: 301
Merged at revision: 301
Proposed branch: lp:~ignacio-nin/percona-server/5.5-bug1028240
Merge into: lp:percona-server/5.5
Diff against target: 25 lines (+2/-2)
2 files modified
build/build-rpm.sh (+1/-1)
build/build-shared-compat-rpm.sh (+1/-1)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.5-bug1028240
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2012-09-21 Approve on 2012-09-23
Review via email: mp+125801@code.launchpad.net

This proposal supersedes a proposal from 2012-09-21.

Description of the change

Remove yassl from the RPM build options

To post a comment you must log in.
Alexey Kopytov (akopytov) wrote : Posted in a previous version of this proposal

Ignacio,

Don't we have to remove "--with yassl" from build-shared-compat.sh as well?

review: Needs Fixing
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build/build-rpm.sh'
2--- build/build-rpm.sh 2012-09-18 05:14:49 +0000
3+++ build/build-rpm.sh 2012-09-21 19:09:20 +0000
4@@ -144,7 +144,7 @@
5 cd "$WORKDIR"
6
7 # Issue RPM command
8- rpmbuild -ba --clean --with yassl $TARGET $SIGN $QUIET \
9+ rpmbuild -ba --clean $TARGET $SIGN $QUIET \
10 "$SOURCEDIR/build/percona-server.spec" \
11 --define "_topdir $WORKDIR_ABS" \
12 --define "redhat_version $REDHAT_RELEASE" \
13
14=== modified file 'build/build-shared-compat-rpm.sh'
15--- build/build-shared-compat-rpm.sh 2012-09-18 05:14:49 +0000
16+++ build/build-shared-compat-rpm.sh 2012-09-21 19:09:20 +0000
17@@ -140,7 +140,7 @@
18 cd "$WORKDIR"
19
20 # Issue RPM command
21- rpmbuild -ba --clean --with yassl $SIGN \
22+ rpmbuild -ba --clean $SIGN \
23 "$SOURCEDIR/build/percona-shared-compat.spec" \
24 --define "_topdir $WORKDIR_ABS" \
25 --define "redhat_version $REDHAT_RELEASE" \

Subscribers

People subscribed via source and target branches