build: pull function2 from stdplus
We no longer need to specify this for ourselves.
Change-Id: I1443268aa7ed4126d6c2488983d7bf796b473fca
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/src/meson.build b/src/meson.build
index c599374..a9e0620 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,28 +1,6 @@
-# Function2 might not have a pkg-config. It is header only so just make
-# sure we can access the needed symbols from the header.
-function2_dep = dependency('function2', required: false)
-has_function2 = meson.get_compiler('cpp').has_header_symbol(
- 'function2/function2.hpp',
- 'fu2::unique_function',
- dependencies: function2_dep,
- required: false)
-if not has_function2
- function2_opts = import('cmake').subproject_options()
- function2_opts.add_cmake_defines({'BUILD_TESTING': 'OFF'})
- function2_proj = import('cmake').subproject(
- 'function2',
- options: function2_opts,
- required: false)
- assert(function2_proj.found(), 'function2 is required')
- if function2_proj.found()
- function2_dep = function2_proj.dependency('function2')
- endif
-endif
-
sdeventplus_deps = [
dependency('libsystemd', version: '>=240'),
dependency('stdplus'),
- function2_dep,
]
sdeventplus_headers = include_directories('.')
diff --git a/subprojects/function2.wrap b/subprojects/function2.wrap
deleted file mode 100644
index 3e495a8..0000000
--- a/subprojects/function2.wrap
+++ /dev/null
@@ -1,3 +0,0 @@
-[wrap-git]
-url = https://github.com/Naios/function2
-revision = HEAD