callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Don't hardcode shared_library() in meson.

Browse Source 
Instead, use the standard library().
This is a meson best practice.

Fixes #2248.

Fixes -Ddefault_library=static not having any effect.

Cherry-Picked-From: bb9c07d8fe8b90c42ba81fb5bb6f8a9826252660
This commit is contained in:
Niklas Hambüchen 2019-11-11 16:37:46 +01:00
parent 75475effb1
commit d5457d1b14
4 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/meson.build
View File

@ -286,7 +286,7 @@ if cc.get_id() == 'msvc'
gdk_link_args += [ '-export:gdk_win32_display_manager_get_type' ] gdk_link_args += [ '-export:gdk_win32_display_manager_get_type' ]
endif endif
libgdk = shared_library('gdk-3', libgdk = library('gdk-3',
soversion: gtk_soversion, soversion: gtk_soversion,
version: gtk_library_version, version: gtk_library_version,
sources: [gdk_sources, gdk_backends_gen_headers, gdkconfig], sources: [gdk_sources, gdk_backends_gen_headers, gdkconfig],

2
gtk/meson.build
View File

@ -964,7 +964,7 @@ foreach l: immodules
endforeach endforeach
# Library # Library
libgtk = shared_library('gtk-3', libgtk = library('gtk-3',
soversion: gtk_soversion, soversion: gtk_soversion,
version: gtk_library_version, version: gtk_library_version,
sources: [typefuncs, gtk_sources, gtkmarshal_h, gtkprivatetypebuiltins_h], sources: [typefuncs, gtk_sources, gtkmarshal_h, gtkprivatetypebuiltins_h],

2
libgail-util/meson.build
View File

@ -17,7 +17,7 @@ if cc.get_id() == 'msvc'
gailutil_link_args += '-def:@0@/gailutil.def'.format(meson.current_source_dir()) gailutil_link_args += '-def:@0@/gailutil.def'.format(meson.current_source_dir())
endif endif
libgailutil = shared_library('gailutil-3', libgailutil = library('gailutil-3',
soversion: gtk_soversion, soversion: gtk_soversion,
version: gail_library_version, version: gail_library_version,
darwin_versions: ['1', '1.0'], darwin_versions: ['1', '1.0'],

2
testsuite/reftests/meson.build
View File

@ -1,6 +1,6 @@
testexecdir = join_paths(installed_test_bindir, 'reftests') testexecdir = join_paths(installed_test_bindir, 'reftests')
libgtkreftestprivate = shared_library('gtkreftestprivate', [ libgtkreftestprivate = library('gtkreftestprivate', [
'reftest-compare.c', 'reftest-compare.c',
'reftest-module.c', 'reftest-module.c',
'reftest-snapshot.c'], 'reftest-snapshot.c'],