add -Wl,-z,muldefs because very recent (rawhide) dbus has gained link…

…age braindamage.
crosswire · Sep 24, 2017 · bfb5198 · bfb5198
1 parent 99768c7
commit bfb5198
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* #822 prefs option not to use alternating fg/bg in parallel displays.
 	* update appdata to get screenshots from github, not sourceforge.
+	* add -Wl,-z,muldefs to stop failures from recent dbus braindamage.
 
 2017-09-03  karl <charcoal@users.sf.net>
 

diff --git a/wscript b/wscript
@@ -435,6 +435,10 @@ def configure(conf):
     env.append_value('CXXFLAGS', ['-fno-delete-null-pointer-checks'])
     env.append_value('CCFLAGS', ['-fno-delete-null-pointer-checks'])
 
+    # add a linker option to stop very recent dbus linkage nightmare.
+    if not env['IS_WIN32']:
+        env.append_value('LINKFLAGS', '-Wl,-z,muldefs')
+
     if opt.delint:
         env.append_value('CXXFLAGS', env['CXXFLAGS_DELINT'])
         env.append_value('CCFLAGS', env['CCFLAGS_DELINT'])