update default SlapOS gcc version to 10.5

See merge request !1557

component/defaults.cfg

@@ -35,7 +35,7 @@ depends =
   ${patch:recipe}
 recipe = slapos.recipe.build
 # Latest version provided by SlapOS.
-part = gcc-8.5
+part = gcc-10.5
 # Minimum version for all components that might be required for
 # slapos.rebootstrap (see https://bugs.python.org/issue34112 about Python 3.7+).
 min_version = 5.4

component/gcc/buildout.cfg

@@ -10,7 +10,7 @@ extends =
   ../binutils/buildout.cfg
 
 parts =
-  gcc-8.5
+  gcc-10.5
 
 [gcc-common]
 recipe = slapos.recipe.cmmi
@@ -63,39 +63,12 @@ extra-configure-options =
   --with-fpu=vfp
   --with-float=hard
 
-[gcc-5.5]
-<= gcc-common
-version = 5.5.0
-md5sum = 0f70424213b4a1113c04ba66ddda0c1f
-# make install does not work when several core are used
-make-targets = install -j1
-patch-binary = ${patch:location}/bin/patch
-patch-options = -p1
-patches =
-  ${:_profile_base_location_}/libsanitizer_Use_pre-computed_size_of_struct_ustat_for_Linux.patch#1e5f33e89f9fe1ca3e406eabcc621762
-  ${:_profile_base_location_}/glibc2.30-ipc_perm.patch#563b7f5a38c2ea6bf741c328422b4c98
-
 [gcc-8.5]
 <= gcc-common
 version = 8.5.0
 md5sum = 0c1f625768840187ef3b10adebe8e3b0
 
-[gcc-10.2]
+[gcc-10.5]
 <= gcc-common
-version = 10.2.0
-md5sum = e9fd9b1789155ad09bcf3ae747596b50
-
-[gcc-minimal]
-<= gcc-5.5
-configure-options =
-  --disable-bootstrap
-  --disable-multilib
-  --with-gmp=${gmp:location}
-  --with-mpfr=${mpfr:location}
-  --with-mpc=${mpc:location}
-  --enable-languages=c
-  --without-isl
-  --without-cloog
-environment =
-  LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${mpfr:location}/lib
-  PATH=${perl:location}/bin:${tar:location}/bin:%(PATH)s
+version = 10.5.0
+md5sum = c7d1958570fbd1cd859b015774b9987a

component/gcc/glibc2.30-ipc_perm.patch

---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h    2020-02-28 11:49:29.763277856 +0000
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h    2020-02-28 11:49:45.092909823 +0000
-@@ -198,8 +198,7 @@
-     unsigned long long __unused1;
-     unsigned long long __unused2;
- #else
--    unsigned short mode;
--    unsigned short __pad1;
-+    unsigned int mode;
-     unsigned short __seq;
-     unsigned short __pad2;
- #if defined(__x86_64__) && !defined(_LP64)

component/gcc/libsanitizer_Use_pre-computed_size_of_struct_ustat_for_Linux.patch

-From 15f0e921f47a9b81c4a30295c8685ad37d3ff4e0 Mon Sep 17 00:00:00 2001
-From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Thu, 24 May 2018 19:52:32 +0000
-Subject: [PATCH] libsanitizer: Use pre-computed size of struct ustat for Linux
-
-Cherry-pick compiler-rt revision 333213:
-
-<sys/ustat.h> has been removed from glibc 2.28 by:
-
-commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7
-Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
-Date:   Sun Mar 18 11:28:59 2018 +0800
-
-    Deprecate ustat syscall interface
-
-This patch uses pre-computed size of struct ustat for Linux.
-
-	PR sanitizer/85835
-	* sanitizer_common/sanitizer_platform_limits_posix.cc: Don't
-	include <sys/ustat.h> for Linux.
-	(SIZEOF_STRUCT_USTAT): New.
-	(struct_ustat_sz): Use SIZEOF_STRUCT_USTAT for Linux.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@260684 138bc75d-0d04-0410-961f-82ee72b054a4
----
- libsanitizer/ChangeLog                                    |  8 ++++++++
- .../sanitizer_common/sanitizer_platform_limits_posix.cc   | 15 +++++++++++++--
- 2 files changed, 21 insertions(+), 2 deletions(-)
-
-# Hunk commented-out as this does not apply on gcc 5.5 .
-#diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
-#index 2ec1a9a..286b789 100644
-#--- a/libsanitizer/ChangeLog
-#+++ b/libsanitizer/ChangeLog
-#@@ -1,3 +1,11 @@
-#+2018-05-24  H.J. Lu  <hongjiu.lu@intel.com>
-#+
-#+	PR sanitizer/85835
-#+	* sanitizer_common/sanitizer_platform_limits_posix.cc: Don't
-#+	include <sys/ustat.h> for Linux.
-#+	(SIZEOF_STRUCT_USTAT): New.
-#+	(struct_ustat_sz): Use SIZEOF_STRUCT_USTAT for Linux.
-#+
-# 2018-04-26  Hans-Peter Nilsson  <hp@axis.com>
-# 
-# 	* configure.tgt <mips*-*-linux*>: Enable build, excluding
-diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-index 858bb21..de18e56 100644
---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -157,7 +157,6 @@ typedef struct user_fpregs elf_fpregset_t;
- # include <sys/procfs.h>
- #endif
- #include <sys/user.h>
--#include <sys/ustat.h>
- #include <linux/cyclades.h>
- #include <linux/if_eql.h>
- #include <linux/if_plip.h>
-@@ -250,7 +249,19 @@ namespace __sanitizer {
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
- 
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
--  unsigned struct_ustat_sz = sizeof(struct ustat);
-+  // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which
-+  // has been removed from glibc 2.28.
-+#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
-+  || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \
-+  || defined(__x86_64__)
-+#define SIZEOF_STRUCT_USTAT 32
-+#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
-+  || defined(__powerpc__) || defined(__s390__)
-+#define SIZEOF_STRUCT_USTAT 20
-+#else
-+#error Unknown size of struct ustat
-+#endif
-+  unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
-   unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
-   unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
- #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
--- 
-2.9.3
-

component/libvnc/buildout.cfg

@@ -53,8 +53,8 @@ environment =
 
 [x11vnc]
 recipe = slapos.recipe.cmmi
-url = https://github.com/LibVNC/x11vnc/archive/0.9.16.tar.gz
-md5sum = 64172e8f896389ec963fff93415f0d93
+url = https://github.com/LibVNC/x11vnc/archive/354602cffa8edcbe813da6dfd051b96d94b3efbc.zip
+md5sum = f9a7f5e206aa0120f3337abf0910851d
 pre-configure =
   autoreconf -fiv -I ${libtool:location}/share/aclocal -I ${pkgconfig:location}/share/aclocal -I ${gettext:location}/share/aclocal
 configure-options =

component/open62541/buildout.cfg

@@ -3,7 +3,6 @@
 [buildout]
 parts =
   open62541
-  gcc-10.2
 extends =
   ../cmake/buildout.cfg
   ../patch/buildout.cfg
@@ -12,6 +11,7 @@ extends =
   ../defaults.cfg
 
 [gcc]
+# we should remove this when open62541 compiles with gcc 12
 max_version = 11
 
 [open62541]
@@ -38,4 +38,4 @@ configure-options =
 post-install =
   cp src/pubsub/*.h deps/open62541_queue.h @@LOCATION@@/include
 environment =
-  PATH=${gcc-10.2:location}/bin:${python3:location}/bin:${patch:location}/bin:%(PATH)s
+  PATH=${gcc:prefix}/bin:${python3:location}/bin:${patch:location}/bin:%(PATH)s

software/beremiz-runtime/software.cfg

@@ -7,7 +7,7 @@ extends =
   ../../component/numpy/buildout.cfg
   ../../component/lxml-python/buildout.cfg
   ../../component/python-sslpsk/buildout.cfg
-  ../../component/gcc/buildout.cfg
+  ../../component/defaults.cfg
   ../../stack/monitor/buildout.cfg
   ../../stack/slapos.cfg
 
@@ -18,13 +18,13 @@ parts =
   python-interpreter
   matiec
   open62541
-  gcc-10.2
 
 [python]
 part = python2.7
 
 [gcc]
-part = gcc-10.2
+# we want this SR to use a fixed gcc (so that we have the same gcc as open62541 component)
+max_version = 0
 
 [open62541]
 configure-options =
@@ -95,7 +95,7 @@ context =
   section buildout  buildout
   raw template_monitor ${monitor2-template:output}
   key openssl_location openssl:location
-  key gcc_location gcc-10.2:location
+  key gcc_location gcc:prefix
 
 [versions]
 Twisted = 20.3.0

software/dream/software.cfg

@@ -16,6 +16,8 @@ parts =
 [gcc]
 # Always build GCC for Fortran (see openblas).
 max_version = 0
+# also use old gcc version for old scipy version used in python2
+part = gcc-8.5
 
 [python]
 part = python2.7

software/neoppod/software-common.cfg

@@ -32,6 +32,11 @@ parts =
 [python]
 part = python2.7
 
+[gcc]
+# use old gcc version for old scipy version used in python2
+max_version = 8
+part = gcc-8.5
+
 [neoppod-repository]
 recipe = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/neoppod.git

software/osie-coupler/software.cfg

 [buildout]
 parts =
-  gcc-10.2
   open62541
   compile-coupler
   slapos-cookbook
@@ -12,7 +11,11 @@ extends =
   ../../component/open62541/buildout.cfg
   ../../stack/monitor/buildout.cfg
   ../../stack/slapos.cfg
-  ../../component/gcc/buildout.cfg
+  ../../component/defaults.cfg
+
+[gcc]
+# we want this SR to use a fixed gcc (so that we have the same gcc as open62541 component)
+max_version = 0
 
 # disable warning for time_t type structure after 2038
 # https://www.gnu.org/software/gnulib/manual/html_node/Avoiding-the-year-2038-problem.html
@@ -62,7 +65,7 @@ recipe = slapos.recipe.cmmi
 path = ${osie-repository:location}/coupler
 bin_dir = ${:path}/bin/
 environment =
-  PATH=${gcc-10.2:location}/bin:/usr/bin
+  PATH=${gcc:prefix}/bin:/usr/bin
   OPEN62541_HOME = ${open62541:location}
   OPEN62541_SOURCE_HOME = ${open62541-source:location}
   C_COMPILER_EXTRA_FLAGS = -L ${mbedtls:location}/lib -Wl,-rpath=${mbedtls:location}/lib -l:libopen62541.so -L${open62541:location}/lib -Wl,-rpath=${open62541:location}/lib -I${open62541:location}/include -I${open62541-source:location}/src/pubsub/ -I${open62541-source:location}/deps

software/peertube/software.cfg

@@ -23,7 +23,6 @@ extends =
   ../../component/ffmpeg/buildout.cfg
   ../../component/postgresql/buildout.cfg
   ../../component/nspr/buildout.cfg
-  ../../component/gcc/buildout.cfg
   ../../component/libxml2/buildout.cfg
   ../../component/libxslt/buildout.cfg
   ../../component/lxml-python/buildout.cfg
@@ -40,7 +39,6 @@ parts =
 # in 99,9% of Slapos Software Releases)
   slapos-cookbook
   dcron
-  gcc
   unzip
   curl
   openssl
@@ -67,7 +65,7 @@ md5sum = 1c9639748d66e8c49fc27e4705f87622
 recipe = slapos.recipe.cmmi
 path = ${peertube:location}
 environment =
-  PATH=${unzip:location}/bin:${vim:location}/bin:${nodejs:location}/bin:${yarn:location}/bin:${python3:location}/bin:${nginx:location}/sbin:${postgresql10:location}/bin:${gcc-10.2:location}/bin:${redis:location}/bin:{git:location}/bin:{wget:location}/bin:%(PATH)s
+  PATH=${unzip:location}/bin:${vim:location}/bin:${nodejs:location}/bin:${yarn:location}/bin:${python3:location}/bin:${nginx:location}/sbin:${postgresql10:location}/bin:${redis:location}/bin:{git:location}/bin:{wget:location}/bin:%(PATH)s
   CPPFLAGS=-I${openssl:location}/include
   LDFLAGS=-L${curl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl
 pre-configure =