summarylogtreecommitdiffstats
path: root/0001-Use-installed-libraries.patch
blob: 5456db3c6c0fd8534697bef5f5bb7d2ca56ed477 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
Only in bitwuzla-0.7.0: build
diff -rua bitwuzla-0.7.0.orig/src/meson.build bitwuzla-0.7.0/src/meson.build
--- bitwuzla-0.7.0.orig/src/meson.build	2024-12-13 04:01:05.000000000 +0100
+++ bitwuzla-0.7.0/src/meson.build	2024-12-13 16:45:30.092416559 +0100
@@ -17,29 +17,32 @@
 # CaDiCaL does not provide pkg-config to find dependency
 cadical_dep = cpp_compiler.find_library('cadical',
                                         has_headers: 'cadical.hpp',
-                                        static: build_static,
+                                        static: true,
                                         required: false)
 if not cadical_dep.found()
   cadical_dep = dependency('cadical', required: true)
 endif
 
 cms_dep = dependency('cryptominisat5',
-                     version: '5.11.21',
                      static: build_static,
                      required: get_option('cryptominisat'))
 
+kissat_inc = include_directories('/usr/include/kissat')
+
 # Kissat does not provide pkg-config to find dependency
 kissat_dep = cpp_compiler.find_library('kissat',
+                                        header_include_directories: [kissat_inc],
                                         has_headers: 'kissat.h',
-                                        static: build_static,
-                                        required: false)
+                                        required: true)
 if not kissat_dep.found()
   kissat_dep = dependency('kissat', required: get_option('kissat'))
 endif
 
+symfpu_inc = include_directories('/usr/include/symfpu')
 # Using system include type suppresses compile warnings originating from the
 # symfpu headers
-symfpu_dep = dependency('symfpu', include_type: 'system', required: true)
+
+symfpu_dep = declare_dependency(include_directories: symfpu_inc)
 
 dependencies = [symfpu_dep, cadical_dep, cms_dep, kissat_dep, gmp_dep]
 
@@ -225,7 +228,7 @@
 ])
 
 # Public header include directory
-bitwuzla_inc = include_directories('../include', 'lib')
+bitwuzla_inc = include_directories('../include', 'lib', '/usr/include/kissat')
 
 bitwuzla_lib = library('bitwuzla',
                       sources + git_config_h,