summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2021-06-23 14:25:55 +0200
committerJonathan Bauer2021-06-23 14:25:55 +0200
commitf7733b635f3f5235396379778ec0e593db529b24 (patch)
treefefcaa2fa64d67838728a9f487c3bd7d52e6010a
parent[slx-network] change to new splashtool path (diff)
downloadsystemd-init-f7733b635f3f5235396379778ec0e593db529b24.tar.gz
systemd-init-f7733b635f3f5235396379778ec0e593db529b24.tar.xz
systemd-init-f7733b635f3f5235396379778ec0e593db529b24.zip
[dnbd3-rootfs] update dnbd3 build routine
-rw-r--r--modules.d/dnbd3-rootfs/helper/build.inc8
1 files changed, 7 insertions, 1 deletions
diff --git a/modules.d/dnbd3-rootfs/helper/build.inc b/modules.d/dnbd3-rootfs/helper/build.inc
index 75397ac2..f5bcc546 100644
--- a/modules.d/dnbd3-rootfs/helper/build.inc
+++ b/modules.d/dnbd3-rootfs/helper/build.inc
@@ -173,15 +173,21 @@ build_compile_dnbd3() {
(
mkdir --parents build
cd build
+ # activate the newer gcc version with sdc
+ scl enable devtoolset-7 llvm-toolset-7 -- bash -c "
+
# Inject CMAKE_FLAGS as a way to control how cmake is called,
# e.g. to pass the kernel version
- cmake ${CMAKE_FLAGS} \
+ cmake3 ${CMAKE_FLAGS} \
+ -DCMAKE_BUILD_TYPE=Release \
-DDNBD3_KERNEL_MODULE=ON \
-DDNBD3_CLIENT_FUSE=OFF \
-DDNBD3_SERVER=OFF \
-DDNBD3_SERVER_FUSE=OFF \
..
make -j
+ "
+ # scl end
)
local ret=$?
popd