Fixes #9919: use suse_version instead of sles_version during build #1180
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
amousset
reviewed
Jan 6, 2017
| @@ -144,12 +144,12 @@ Requires: dmidecode | |||
|
|
|||
| ## 3 - SLES: No LMDB yet | |||
| # Reference for suse_version : https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto | |||
| %if 0%{?suse_version} && 0%{?suse_version} < 1140 | |||
| %if 0%{?suse_version} && 0%{?suse_version} < 1200 | |||
There was a problem hiding this comment.
There was a problem hiding this comment.
this is < 1200 (strictly inferior to 12) the old value was inferior to 1315
There was a problem hiding this comment.
Yes but it's not what we want for opensuse 11.4 at least
amousset
reviewed
Jan 6, 2017
| ## | ||
| %if 0%{?sles_version} && 0%{?sles_version} < 11 | ||
| # Reference for suse_version : https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto | ||
| %if 0%{?suse_version} && 0%{?suse_version} < 1200 |
There was a problem hiding this comment.
We probably want to use system openssl onSLES11 too
|
Commit modified |
peckpeck
force-pushed
the
arch_9919/use_suse_version_instead_of_sles_version_during_build
branch
from
3afb82d
to
dbacc79
Compare
|
Commit modified |
peckpeck
force-pushed
the
arch_9919/use_suse_version_instead_of_sles_version_during_build
branch
from
dbacc79
to
4817db5
Compare
|
ping @amousset |
amousset
reviewed
Jan 18, 2017
| @@ -145,7 +145,8 @@ dos2unix doc/*.html | |||
|
|
|||
| %build | |||
| export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall" | |||
| %if 0%{?suse_version} > 1000 && 0%{?suse_version} < 1030 | |||
There was a problem hiding this comment.
< 1030 does not match SELS 10 SP3, this changes the behavior on it (which is IIRC our only supported SLES 10). Is it intended?
|
Commit modified |
peckpeck
force-pushed
the
arch_9919/use_suse_version_instead_of_sles_version_during_build
branch
from
4817db5
to
45322cd
Compare
|
OK, merging this PR |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://www.rudder-project.org/redmine/issues/9919