[Spice-commits] server/meson.build

[GitLab Mirror]

 server/meson.build |   33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

New commits:
commit 137ae60c9ab1f8071182de562f4e852a7b527ee8
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Mar 26 10:13:20 2020 +0000

    build: Respect Meson's default_library option
    
    Distributions like to be in control of this.
    From a patch from  James Le Cuirot.
    
    Instead of always build both shared and static libraries for
    SPICE server (static is used for the tests) compile library
    as user requested. In case we need the static library for tests
    (which now can be disabled) create a static library extracting
    objects from shared library.
    This also fixes the problem that Meson installed the static
    library even if not requested and just used for tests.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>

diff --git a/server/meson.build b/server/meson.build
index fb01bf89..a3c43eb5 100644
--- a/server/meson.build
+++ b/server/meson.build
@@ -175,17 +175,30 @@ spice_server_link_args = ['-Wl,--no-copy-dt-needed-entries',
                           '-Wl,-z,now',
                           '-Wl,--version-script=@0@'.format(spice_server_syms_path)]
 
-spice_server_libs = both_libraries('spice-server', spice_server_sources,
-                                   version : spice_server_so_version,
-                                   install : true,
-                                   include_directories : spice_server_include,
-                                   link_args : compiler.get_supported_link_arguments(spice_server_link_args),
-                                   link_depends : spice_server_syms,
-                                   dependencies : spice_server_deps,
-                                   gnu_symbol_visibility : 'hidden')
+spice_server_libs = library('spice-server', spice_server_sources,
+                            version : spice_server_so_version,
+                            install : true,
+                            include_directories : spice_server_include,
+                            link_args : compiler.get_supported_link_arguments(spice_server_link_args),
+                            link_depends : spice_server_syms,
+                            dependencies : spice_server_deps,
+                            gnu_symbol_visibility : 'hidden')
 
 if get_option('tests')
-  spice_server_shared_lib = spice_server_libs.get_shared_lib()
-  spice_server_static_lib = spice_server_libs.get_static_lib()
+  if get_option('default_library') == 'both'
+    spice_server_shared_lib = spice_server_libs.get_shared_lib()
+    spice_server_static_lib = spice_server_libs.get_static_lib()
+  elif get_option('default_library') == 'shared'
+    spice_server_shared_lib = spice_server_libs
+    # create static library extracting objects from shared one, avoid to
+    # install static library using both_libraries
+    spice_server_static_lib = static_library('spice-server-static',
+                                             objects: spice_server_libs.extract_all_objects(),
+                                             dependencies : spice_server_deps)
+  else
+    # here we use the static library to link to utilities (currently spice-server-replay)
+    spice_server_shared_lib = spice_server_libs
+    spice_server_static_lib = spice_server_libs
+  endif
   subdir('tests')
 endif