summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2021-07-30 10:41:50 +0200
committerJonathan Bauer2021-07-30 10:41:50 +0200
commit50cc898d7d0f46449ed62574f7eb9b6bb4852674 (patch)
tree4f7a01086c436edd962349addd1653d685dadc10
parent[busybox] fix install paths & remove double warning (diff)
downloadsystemd-init-50cc898d7d0f46449ed62574f7eb9b6bb4852674.tar.gz
systemd-init-50cc898d7d0f46449ed62574f7eb9b6bb4852674.tar.xz
systemd-init-50cc898d7d0f46449ed62574f7eb9b6bb4852674.zip
[dnbd3-rootfs] add support for scl if needed
-rw-r--r--modules.d/dnbd3-rootfs/helper/build.inc31
1 files changed, 22 insertions, 9 deletions
diff --git a/modules.d/dnbd3-rootfs/helper/build.inc b/modules.d/dnbd3-rootfs/helper/build.inc
index 75397ac2..35aeb359 100644
--- a/modules.d/dnbd3-rootfs/helper/build.inc
+++ b/modules.d/dnbd3-rootfs/helper/build.inc
@@ -168,20 +168,33 @@ build_compile_dnbd3() {
`CMAKE_FLAGS="-DKERNEL_BUILD_DIR=<path_to_kernel_build_dir>" \
build_compile_dnbd3 path/to/dnbd3/source/`
'
+ # scl?
+ _cmake_cmd=("cmake")
+ _wrapper_cmd=("bash")
+ shopt -s nocasematch
+ if [[ "$(lsb_release -irs)" =~ ^centos\ 7 ]]; then
+ _cmake_cmd=("cmake3")
+ _wrapper_cmd=("scl" "enable" "devtoolset-7" "llvm-toolset-7" "--" "bash")
+ fi
+ shopt -u nocasematch
+
[ -z "$1" ] && return 1
pushd "$1"
(
mkdir --parents build
cd build
- # Inject CMAKE_FLAGS as a way to control how cmake is called,
- # e.g. to pass the kernel version
- cmake ${CMAKE_FLAGS} \
- -DDNBD3_KERNEL_MODULE=ON \
- -DDNBD3_CLIENT_FUSE=OFF \
- -DDNBD3_SERVER=OFF \
- -DDNBD3_SERVER_FUSE=OFF \
- ..
- make -j
+ ${_wrapper_cmd[@]} -c "
+ # Inject CMAKE_FLAGS as a way to control how cmake is called,
+ # e.g. to pass the kernel version
+ ${_cmake_cmd[@]} ${CMAKE_FLAGS} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DDNBD3_KERNEL_MODULE=ON \
+ -DDNBD3_CLIENT_FUSE=OFF \
+ -DDNBD3_SERVER=OFF \
+ -DDNBD3_SERVER_FUSE=OFF \
+ ..
+ make -j
+ "
)
local ret=$?
popd