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

Proposed by Ignacio Nin
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
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) Approve
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.
Revision history for this message
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
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'build/build-rpm.sh'
--- build/build-rpm.sh 2012-09-18 05:14:49 +0000
+++ build/build-rpm.sh 2012-09-21 19:09:20 +0000
@@ -144,7 +144,7 @@
144 cd "$WORKDIR"144 cd "$WORKDIR"
145145
146 # Issue RPM command146 # Issue RPM command
147 rpmbuild -ba --clean --with yassl $TARGET $SIGN $QUIET \147 rpmbuild -ba --clean $TARGET $SIGN $QUIET \
148 "$SOURCEDIR/build/percona-server.spec" \148 "$SOURCEDIR/build/percona-server.spec" \
149 --define "_topdir $WORKDIR_ABS" \149 --define "_topdir $WORKDIR_ABS" \
150 --define "redhat_version $REDHAT_RELEASE" \150 --define "redhat_version $REDHAT_RELEASE" \
151151
=== modified file 'build/build-shared-compat-rpm.sh'
--- build/build-shared-compat-rpm.sh 2012-09-18 05:14:49 +0000
+++ build/build-shared-compat-rpm.sh 2012-09-21 19:09:20 +0000
@@ -140,7 +140,7 @@
140 cd "$WORKDIR"140 cd "$WORKDIR"
141141
142 # Issue RPM command142 # Issue RPM command
143 rpmbuild -ba --clean --with yassl $SIGN \143 rpmbuild -ba --clean $SIGN \
144 "$SOURCEDIR/build/percona-shared-compat.spec" \144 "$SOURCEDIR/build/percona-shared-compat.spec" \
145 --define "_topdir $WORKDIR_ABS" \145 --define "_topdir $WORKDIR_ABS" \
146 --define "redhat_version $REDHAT_RELEASE" \146 --define "redhat_version $REDHAT_RELEASE" \

Subscribers

People subscribed via source and target branches