[libhandy] meson: Only disable implicit export for the libhandy sofile



commit 7ade1ae68961959905a3e3912578683017179fbb
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Thu Jul 30 04:32:13 2020 +0500

    meson: Only disable implicit export for the libhandy sofile
    
    We should not do this for the Glade module.
    
    Fixes https://gitlab.gnome.org/GNOME/libhandy/-/issues/317
    
    Signed-off-by: Alexander Mikhaylenko <alexm gnome org>

 meson.build     | 21 ---------------------
 src/meson.build | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 21 deletions(-)
---
diff --git a/meson.build b/meson.build
index 228281ad..8e8bd5f1 100644
--- a/meson.build
+++ b/meson.build
@@ -29,10 +29,6 @@ current = handy_version_minor * 100 + handy_version_micro - handy_interface_age
 revision = handy_interface_age
 libversion = '@0@.@1@.@2@'.format(soversion, current, revision)
 
-config_h = configuration_data()
-config_h.set_quoted('GETTEXT_PACKAGE', 'libhandy')
-config_h.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))
-
 add_project_arguments([
   '-DHAVE_CONFIG_H',
   '-DHANDY_COMPILATION',
@@ -95,18 +91,6 @@ if get_option('profiling')
   test_c_args += '-pg'
 endif
 
-# Symbol visibility
-if target_system == 'windows'
-  config_h.set('DLL_EXPORT', true)
-  config_h.set('_HDY_EXTERN', '__declspec(dllexport) extern')
-  if cc.get_id() != 'msvc'
-    global_c_args += ['-fvisibility=hidden']
-  endif
-else
-  config_h.set('_HDY_EXTERN', '__attribute__((visibility("default"))) extern')
-  global_c_args += ['-fvisibility=hidden']
-endif
-
 foreach arg: test_c_args
   if cc.has_multi_arguments(arg)
     global_c_args += arg
@@ -138,11 +122,6 @@ introspection = introspection_feature.enabled() or introspection_feature.auto()
 
 gnome = import('gnome')
 
-configure_file(
-         output: 'config.h',
-  configuration: config_h,
-)
-
 subdir('src')
 subdir('po')
 subdir('examples')
diff --git a/src/meson.build b/src/meson.build
index 432316a8..2356bf6e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -185,6 +185,28 @@ libhandy_deps = [
 libhandy_c_args = [
   '-DG_LOG_DOMAIN="Handy"',
 ]
+
+config_h = configuration_data()
+config_h.set_quoted('GETTEXT_PACKAGE', 'libhandy')
+config_h.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))
+
+# Symbol visibility
+if target_system == 'windows'
+  config_h.set('DLL_EXPORT', true)
+  config_h.set('_HDY_EXTERN', '__declspec(dllexport) extern')
+  if cc.get_id() != 'msvc'
+    libhandy_c_args += ['-fvisibility=hidden']
+  endif
+else
+  config_h.set('_HDY_EXTERN', '__attribute__((visibility("default"))) extern')
+  libhandy_c_args += ['-fvisibility=hidden']
+endif
+
+configure_file(
+         output: 'config.h',
+  configuration: config_h,
+)
+
 libhandy_link_args = []
 libhandy_symbols_file = 'libhandy.syms'
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]