summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel@osg.samsung.com>2017-12-11 15:49:07 +0100
committerMarcel Hollerbach <marcel@osg.samsung.com>2017-12-11 15:49:07 +0100
commitfbc72ceaee7b959fe0ca9b026a67d52850aaf8c1 (patch)
tree40aafd4e289a791678721d96adfd387c6f14937c
parent45aeda7843535505c842b6760df83870704bc1a6 (diff)
build: fix build on picky systemsdevs/bu5hm4n/bsd_build_fix
there are a few systems out there that are checking the .so files that are linked dynamically into a created shared library. This leads to a problem, since the .so files often also carries unresolved symbols, which are resolved by other dynamic linked .so files. However, to ship arround those picky systems, we are not reacting to unresolved symbols at all for now. The error will rise at runtime and come up in a nice little dialog instead. this fixes build on bsd
-rw-r--r--src/modules/meson.build4
-rw-r--r--src/modules/wizard/meson.build2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/meson.build b/src/modules/meson.build
index 974a79ced..11b93df3f 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -135,7 +135,7 @@ foreach m: mods
135 dependencies : [ module_deps, deps ], 135 dependencies : [ module_deps, deps ],
136 install_dir : _dir_bin, 136 install_dir : _dir_bin,
137 install : true, 137 install : true,
138 link_args : '-Wl,--unresolved-symbols=ignore-in-object-files' 138 link_args : '-Wl,--unresolved-symbols=ignore-all'
139 ) 139 )
140 else 140 else
141 shared_module(m, src, 141 shared_module(m, src,
@@ -145,7 +145,7 @@ foreach m: mods
145 dependencies : [ module_deps, deps ], 145 dependencies : [ module_deps, deps ],
146 install_dir : _dir_bin, 146 install_dir : _dir_bin,
147 install : true, 147 install : true,
148 link_args : '-Wl,--unresolved-symbols=ignore-in-object-files' 148 link_args : '-Wl,--unresolved-symbols=ignore-all'
149 ) 149 )
150 endif 150 endif
151 endif 151 endif
diff --git a/src/modules/wizard/meson.build b/src/modules/wizard/meson.build
index 9670536e6..80b1b7150 100644
--- a/src/modules/wizard/meson.build
+++ b/src/modules/wizard/meson.build
@@ -35,7 +35,7 @@ if get_option(m) == true
35 dependencies : module_deps, 35 dependencies : module_deps,
36 install_dir : _dir_bin, 36 install_dir : _dir_bin,
37 install : true, 37 install : true,
38 link_args : '-Wl,--unresolved-symbols=ignore-in-object-files' 38 link_args : '-Wl,--unresolved-symbols=ignore-all'
39 ) 39 )
40 endforeach 40 endforeach
41 41