Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
osc-plugins
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
mpcdf
obs
osc-plugins
Commits
5ebf4d54
Commit
5ebf4d54
authored
May 02, 2020
by
Lorenz Hüdepohl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support gcc/6 on SLE_15
parent
ce288a7f
Pipeline
#74219
passed with stage
in 16 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletion
+12
-1
mpcdf_common.py
mpcdf_common.py
+12
-1
No files found.
mpcdf_common.py
View file @
5ebf4d54
...
...
@@ -65,11 +65,22 @@ def dist_prjconf_tags(distribution):
ExpandFlags: module:python36-3.6
"""
).
strip
()
sles15_prjconf_tags
=
textwrap
.
dedent
(
"""
%if "%{_repository}" == "gcc_6" || "%{_repository}" == "gcc_7"
# gcc6/7 cannot deal with "-fstack-clash-protection" that has been added in SLE15 by default
Optflags: * -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables
%endif
"""
).
strip
()
res
=
""
if
"CentOS"
in
distribution
:
res
+=
centos_prjconf_tags
if
"CentOS_8"
in
distribution
:
res
+=
"
\n
"
+
centos8_prjconf_tags
if
"SLE_15"
in
distribution
:
res
+=
sles15_prjconf_tags
return
res
...
...
@@ -604,7 +615,7 @@ def mpcdf_setup_subproject(api_url, project, distribution, microarchitecture,
prjconf_ours
.
append
(
"Constraint: hostlabel {0}"
.
format
(
microarchitecture
))
prjconf_ours
.
append
(
"Preinstall: mpcdf_{0}_directory"
.
format
(
microarchitecture
))
prjconf_ours
.
append
(
"
PublishFilter: ^mpcdf_.*$
"
)
prjconf_ours
.
append
(
""
)
extra_tags
=
dist_prjconf_tags
(
distribution
)
if
extra_tags
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment