Commit c163bd5e authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

software/osie-coupler: keep the build source directory instead of having...

software/osie-coupler: keep the build source directory instead of having another open62541-source part.
parent 14968c4a
...@@ -17,7 +17,8 @@ max_version = 11 ...@@ -17,7 +17,8 @@ max_version = 11
[open62541] [open62541]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://github.com/open62541/open62541/archive/refs/heads/pack/v1.3.4.zip tag = v1.3.4
url = https://github.com/open62541/open62541/archive/refs/heads/pack/${:tag}.zip
md5sum = b9c1d3ae9d7593941108f46036f29ccc md5sum = b9c1d3ae9d7593941108f46036f29ccc
patch-options = -p1 patch-options = -p1
patches = patches =
......
...@@ -17,14 +17,6 @@ extends = ...@@ -17,14 +17,6 @@ extends =
# we want this SR to use a fixed gcc (so that we have the same gcc as open62541 component) # we want this SR to use a fixed gcc (so that we have the same gcc as open62541 component)
max_version = 0 max_version = 0
# we need open62541's sources even after compiling and linking in [open62541]
# section. Reasons is that coupler's C application depends on it.
[open62541-source]
recipe = slapos.recipe.build:download-unpacked
shared = true
url = ${open62541:url}
md5sum = ${open62541:md5sum}
[open62541] [open62541]
pre-configure += pre-configure +=
${git:location}/bin/git clone -b v1.1.6 https://github.com/LiamBindle/MQTT-C.git deps/mqtt-c ${git:location}/bin/git clone -b v1.1.6 https://github.com/LiamBindle/MQTT-C.git deps/mqtt-c
...@@ -46,6 +38,10 @@ configure-options = ...@@ -46,6 +38,10 @@ configure-options =
-DUA_ENABLE_PUBSUB_MQTT=ON -DUA_ENABLE_PUBSUB_MQTT=ON
environment += environment +=
LDFLAGS=-L${mbedtls:location}/lib -Wl,-rpath=${mbedtls:location}/lib LDFLAGS=-L${mbedtls:location}/lib -Wl,-rpath=${mbedtls:location}/lib
# we need open62541's sources even after compiling and linking in [open62541]
# section. Reasons is that coupler's C application depends on it.
keep-compile-dir = true
source-location = @@LOCATION@@/.build/open62541-pack-${open62541:tag}
[osie-repository] [osie-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
...@@ -60,8 +56,8 @@ bin_dir = ${:path}/bin/ ...@@ -60,8 +56,8 @@ bin_dir = ${:path}/bin/
environment = environment =
PATH=${gcc:prefix}/bin:/usr/bin PATH=${gcc:prefix}/bin:/usr/bin
OPEN62541_HOME = ${open62541:location} OPEN62541_HOME = ${open62541:location}
OPEN62541_SOURCE_HOME = ${open62541-source: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 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
configure-command = true configure-command = true
[instance-profile] [instance-profile]
......
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