Commit 64c4c052 authored by Ivan Tyagov's avatar Ivan Tyagov

Fix gcc

See merge request nexedi/slapos!1548
parents eb22e363 ab6abffd
Pipeline #33674 failed with stage
in 0 seconds
# Implementation of OPC UA (OPC Unified Architecture). https://open62541.org/ # Implementation of OPC UA (OPC Unified Architecture). https://open62541.org/
[buildout] [buildout]
parts = open62541 parts =
open62541
gcc-10.2
extends = extends =
../cmake/buildout.cfg ../cmake/buildout.cfg
../patch/buildout.cfg ../patch/buildout.cfg
../python3/buildout.cfg ../python3/buildout.cfg
../gcc/buildout.cfg
../defaults.cfg ../defaults.cfg
[gcc] [gcc]
...@@ -35,4 +38,4 @@ configure-options = ...@@ -35,4 +38,4 @@ configure-options =
post-install = post-install =
cp src/pubsub/*.h deps/open62541_queue.h @@LOCATION@@/include cp src/pubsub/*.h deps/open62541_queue.h @@LOCATION@@/include
environment = environment =
PATH=${python3:location}/bin:${patch:location}/bin:%(PATH)s PATH=${gcc-10.2:location}/bin:${python3:location}/bin:${patch:location}/bin:%(PATH)s
[instance-profile] [instance-profile]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = e68998b1dc1c851303be5df6f2c2a84a md5sum = 4b7e36bbb077f91cdde5a4a05502cf71
...@@ -53,9 +53,8 @@ recipe = slapos.cookbook:wrapper ...@@ -53,9 +53,8 @@ recipe = slapos.cookbook:wrapper
# needed libraries and tools inside SlapOS context # needed libraries and tools inside SlapOS context
environment = environment =
BEREMIZPYTHONPATH = {{ buildout['bin-directory'] }}/pythonwitheggs BEREMIZPYTHONPATH = {{ buildout['bin-directory'] }}/pythonwitheggs
PATH=$PATH:/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin PATH={{ gcc_location }}/bin
LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/9/:/usr/lib/x86_64-linux-gnu:/usr/lib:/lib/x86_64-linux-gnu/:/lib:/usr/lib/x86_64-linux-gnu/:{{ openssl_location }}/lib LIBRARY_PATH={{ openssl_location }}/lib
COMPILER_PATH=/usr/lib/gcc/x86_64-linux-gnu/9/:/usr/lib/gcc/x86_64-linux-gnu/
command-line = command-line =
{{ buildout['bin-directory'] }}/pythonwitheggs {{ buildout['directory'] }}/parts/beremiz-source/Beremiz_cli.py -k --project-home ${directory:home}/parts/download-plc/ build transfer run {{ buildout['bin-directory'] }}/pythonwitheggs {{ buildout['directory'] }}/parts/beremiz-source/Beremiz_cli.py -k --project-home ${directory:home}/parts/download-plc/ build transfer run
......
...@@ -7,6 +7,7 @@ extends = ...@@ -7,6 +7,7 @@ extends =
../../component/numpy/buildout.cfg ../../component/numpy/buildout.cfg
../../component/lxml-python/buildout.cfg ../../component/lxml-python/buildout.cfg
../../component/python-sslpsk/buildout.cfg ../../component/python-sslpsk/buildout.cfg
../../component/gcc/buildout.cfg
../../stack/monitor/buildout.cfg ../../stack/monitor/buildout.cfg
../../stack/slapos.cfg ../../stack/slapos.cfg
...@@ -17,10 +18,14 @@ parts = ...@@ -17,10 +18,14 @@ parts =
python-interpreter python-interpreter
matiec matiec
open62541 open62541
gcc-10.2
[python] [python]
part = python2.7 part = python2.7
[gcc]
part = gcc-10.2
[open62541] [open62541]
configure-options = configure-options =
-DBUILD_SHARED_LIBS=OFF -DBUILD_SHARED_LIBS=OFF
...@@ -90,8 +95,7 @@ context = ...@@ -90,8 +95,7 @@ context =
section buildout buildout section buildout buildout
raw template_monitor ${monitor2-template:output} raw template_monitor ${monitor2-template:output}
key openssl_location openssl:location key openssl_location openssl:location
# md5sum is fetched from buildout.hash.cfg and can be recalculated automatically by key gcc_location gcc-10.2:location
# calling update-hash
[versions] [versions]
Twisted = 20.3.0 Twisted = 20.3.0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment