osie-coupler and beremiz-runtime: use default slapos gcc

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/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