From 869cef2d0693dbf87786a8f9961720c375f38178 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flow@cs.fau.de>
Date: Mon, 1 Mar 2021 09:23:37 +0100
Subject: [PATCH 1/2] [build] Make boost_thread_dep an optional dependency

---
 meson.build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 7c5fee1e..be4deabd 100644
--- a/meson.build
+++ b/meson.build
@@ -12,6 +12,8 @@ thread_dep = dependency('threads')
 uring_dep = dependency('liburing')
 emper_dependencies = [thread_dep, uring_dep]
 
+boost_thread_dep = dependency('boost', modules : ['thread'], required: false)
+
 run_target('iwyu',
 		   command: 'tools/check-iwyu')
 
@@ -42,7 +44,9 @@ conf_data.set('EMPER_' + semaphore_impl.to_upper() + '_WAKEUP_SEMAPHORE', true)
 
 locked_unbounded_queue_impl = get_option('locked_unbounded_queue_implementation')
 if locked_unbounded_queue_impl == 'boost_shared_mutex'
-	boost_thread_dep = dependency('boost', modules : ['thread'])
+	if not boost_thread_dep.found()
+		error('Boost thread module not found, but locked_unbounded_queue_implementation set to boost_shared_mutex')
+	endif
 	emper_dependencies += [boost_thread_dep]
 endif
 conf_data.set('EMPER_' + locked_unbounded_queue_impl.to_upper() + '_LOCKED_UNBOUNDED_QUEUE', true)
-- 
GitLab


From ff724a95701cf5caebe7fe5777198f269263be6e Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flow@cs.fau.de>
Date: Mon, 1 Mar 2021 09:24:09 +0100
Subject: [PATCH 2/2] [gitlab-ci] Bump flowdalic/debian-testing-dev docker
 image to 1.5

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d4eb474..e0b03e17 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: "flowdalic/debian-testing-dev:1.4"
+image: "flowdalic/debian-testing-dev:1.5"
 
 before_script:
   - |
-- 
GitLab