fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 meson.build     |   25 +++++++++++++++----------
 src/meson.build |    1 -
 2 files changed, 15 insertions(+), 11 deletions(-)

New commits:
commit dd5c5fd41126845fa9c75bedd7894e47370a32d1
Merge: a352486 9756380
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Apr 24 06:13:19 2025 +0000

    Merge branch 'xry111/no-static' into 'main'
    
    meson: don't force installation of a static library
    
    See merge request fontconfig/fontconfig!383

commit 97563802cb789030821249fa7b49365a3632a69b
Author: Xi Ruoyao <xry111 at xry111.site>
Date:   Thu Apr 17 11:40:45 2025 +0800

    meson: don't force installation of a static library
    
    We shouldn't install the static library if -D default_library=shared.
    
    Changelog: fixed
    Signed-off-by: Xi Ruoyao <xry111 at xry111.site>

diff --git a/meson.build b/meson.build
index 344682e..b795948 100644
--- a/meson.build
+++ b/meson.build
@@ -504,18 +504,23 @@ if get_option('fontations').enabled()
   lib_fontconfig_link_with_libs += [fc_fontations]
 endif
 
-if get_option('default_library') in ['both', 'shared']
-  libfontconfig = both_libraries('fontconfig',
-    lib_fontconfig_sources,
-    c_shared_args: win_export_args,
-    soversion: soversion,
-    version: libversion,
-    darwin_versions: osxversion,
-    kwargs: lib_fontconfig_kwargs)
+libfontconfig = library('fontconfig',
+  lib_fontconfig_sources,
+  c_shared_args: win_export_args,
+  soversion: soversion,
+  version: libversion,
+  darwin_versions: osxversion,
+  install: true,
+  kwargs: lib_fontconfig_kwargs)
+
+if get_option('default_library') == 'both'
   libfontconfig_internal = libfontconfig.get_static_lib()
-else
-  libfontconfig = static_library('fontconfig', lib_fontconfig_sources, kwargs: lib_fontconfig_kwargs)
+elif get_option('default_library') == 'static'
   libfontconfig_internal = libfontconfig
+else
+  libfontconfig_internal = static_library('fontconfig',
+    lib_fontconfig_sources,
+    kwargs: lib_fontconfig_kwargs)
 endif
 
 fontconfig_dep = declare_dependency(link_with: libfontconfig,
diff --git a/src/meson.build b/src/meson.build
index fe585eb..ee884f1 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -70,6 +70,5 @@ lib_fontconfig_kwargs = {
   'include_directories': incbase,
   'dependencies': [deps, math_dep],
   'link_with': lib_fontconfig_link_with_libs,
-  'install': true,
 }