Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
104
Merge Requests
104
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
d2b20acd
Commit
d2b20acd
authored
May 19, 2020
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Plain Diff
ERP5: use gcc 8.2
See merge request !756
parents
8cc12eb3
30a0a3ef
Pipeline
#9488
failed with stage
Changes
6
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
45 additions
and
14 deletions
+45
-14
component/glibmm/buildout.cfg
component/glibmm/buildout.cfg
+4
-1
component/glibmm/glibmm-fix-threads-gobject.patch
component/glibmm/glibmm-fix-threads-gobject.patch
+34
-0
component/kumo/buildout.cfg
component/kumo/buildout.cfg
+4
-0
software/cloudooo/software-common.cfg
software/cloudooo/software-common.cfg
+0
-5
software/nextcloud/software.cfg
software/nextcloud/software.cfg
+0
-5
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+3
-3
No files found.
component/glibmm/buildout.cfg
View file @
d2b20acd
...
@@ -4,6 +4,7 @@ extends =
...
@@ -4,6 +4,7 @@ extends =
../glib/buildout.cfg
../glib/buildout.cfg
../libsigc/buildout.cfg
../libsigc/buildout.cfg
../perl/buildout.cfg
../perl/buildout.cfg
../patch/buildout.cfg
../pkgconfig/buildout.cfg
../pkgconfig/buildout.cfg
../xz-utils/buildout.cfg
../xz-utils/buildout.cfg
parts =
parts =
...
@@ -17,8 +18,10 @@ md5sum = e7416beff6cba1f38c2bccd0dc8c3278
...
@@ -17,8 +18,10 @@ md5sum = e7416beff6cba1f38c2bccd0dc8c3278
pkg_config_depends = ${glib:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
pkg_config_depends = ${glib:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
configure-options =
configure-options =
--disable-documentation
--disable-documentation
patches = ${:_profile_base_location_}/glibmm-fix-threads-gobject.patch#75ab0e9e5d1df55e8f6177b9934359ae
patch-options = -p1
environment =
environment =
PATH=${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:${glib:location}/bin:%(PATH)s
PATH=${p
atch:location}/bin:${p
erl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:${glib:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${:pkg_config_depends}
PKG_CONFIG_PATH=${:pkg_config_depends}
CPPFLAGS=-I${gettext:location}/include
CPPFLAGS=-I${gettext:location}/include
LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
component/glibmm/glibmm-fix-threads-gobject.patch
0 → 100644
View file @
d2b20acd
From 37d57ae9572b7d74aa385a30313eceae7f2d3fce Mon Sep 17 00:00:00 2001
From: Kjell Ahlstedt <kjellahlstedt@gmail.com>
Date: Wed, 20 Dec 2017 20:00:32 +0100
Subject: [PATCH] Glib::Threads::Private: Fix gobj()
Bug 791711
---
glib/src/threads.hg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/glib/src/threads.hg b/glib/src/threads.hg
index 86d7a17b..c82a6130 100644
--- a/glib/src/threads.hg
+++ b/glib/src/threads.hg
@@ -628,7 +628,7 @@
public:
*/
inline void replace(T* data);
- GPrivate* gobj() { return gobject_; }
+ GPrivate* gobj() { return &gobject_; }
private:
GPrivate gobject_;
--- a/glib/glibmm/threads.h 2017-09-04 15:27:31.000000000 +0200
+++ b/glib/glibmm/threads.h 2018-05-05 10:53:44.339288554 +0200
@@ -657,7 +657,7 @@
*/
inline void replace(T* data);
- GPrivate* gobj() { return gobject_; }
+ GPrivate* gobj() { return &gobject_; }
private:
GPrivate gobject_;
component/kumo/buildout.cfg
View file @
d2b20acd
...
@@ -8,6 +8,10 @@ extends =
...
@@ -8,6 +8,10 @@ extends =
parts = kumo
parts = kumo
[gcc]
# KumoFS fails to build with GCC 6.
min_version = 7
[kumo]
[kumo]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
shared = true
shared = true
...
...
software/cloudooo/software-common.cfg
View file @
d2b20acd
...
@@ -7,11 +7,6 @@ extends =
...
@@ -7,11 +7,6 @@ extends =
parts =
parts =
${cloudooo-buildout:parts}
${cloudooo-buildout:parts}
[gcc]
# For old version of glibmm.
part = gcc-5.5
max_version = 6
[cloudooo-buildout]
[cloudooo-buildout]
parts =
parts =
${stack-cloudooo-buildout:parts}
${stack-cloudooo-buildout:parts}
...
...
software/nextcloud/software.cfg
View file @
d2b20acd
...
@@ -4,11 +4,6 @@ extends =
...
@@ -4,11 +4,6 @@ extends =
../../component/redis/buildout.cfg
../../component/redis/buildout.cfg
../../stack/lamp/buildout.cfg
../../stack/lamp/buildout.cfg
[gcc]
# For old version of glibmm.
part = gcc-5.5
max_version = 6
[nc-download-base]
[nc-download-base]
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
ignore-existing = true
ignore-existing = true
...
...
stack/erp5/buildout.cfg
View file @
d2b20acd
...
@@ -85,9 +85,9 @@ parts +=
...
@@ -85,9 +85,9 @@ parts +=
jupyter-notebook-initialized-scripts
jupyter-notebook-initialized-scripts
[gcc]
[gcc]
#
KumoFS is known not to build with gcc>6
.
#
We want a recent gcc for performance, also with fortran support for scientific python
.
# It may work with slightly more recent but not tested.
part = gcc-8.2
part = gcc-5.5
# override instance-jupyter-notebook not to render into default template.cfg
# override instance-jupyter-notebook not to render into default template.cfg
[instance-jupyter-notebook]
[instance-jupyter-notebook]
...
...
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