Merge branch 'dont-hardcode-shared-library' into 'master'

build: Don't hardcode shared_library() in meson

See merge request GNOME/gtk!1172

.gitlab-ci.yml

@@ -12,7 +12,7 @@ stages:
     - subprojects/libepoxy/
     - subprojects/pango/
 
-fedora-x86_64:
+fedora-x86_64: &fedora-x86_64-defaults
   image: registry.gitlab.gnome.org/gnome/gtk/master:v7
   stage: build
   script:
@@ -33,6 +33,11 @@ fedora-x86_64:
     key: "$CI_JOB_NAME"
     <<: *cache-paths
 
+fedora-x86_64-staticlibs:
+  variables:
+    EXTRA_MESON_FLAGS: "-Ddefault_library=both"
+  <<: *fedora-x86_64-defaults
+
 .mingw-defaults: &mingw-defaults
   stage: build
   tags:

.gitlab-ci/test-docker.sh

@@ -17,6 +17,7 @@ meson \
         -Dbroadway-backend=true \
         -Dvulkan=yes \
         --werror \
+        ${EXTRA_MESON_FLAGS:-} \
         _build $srcdir
 unset CCACHE_DISABLE
 

gtk/meson.build

@@ -1007,15 +1007,15 @@ if cc.has_header('langinfo.h')
 endif
 
 # Library
-libgtk = shared_library('gtk-4',
-                        soversion: gtk_soversion,
-                        sources: [typefuncs, gtk_sources, gtkmarshal_h, gtkprivatetypebuiltins_h],
-                        c_args: gtk_cargs + common_cflags,
-                        include_directories: [confinc, gdkinc, gskinc, gtkinc],
-                        dependencies: gtk_deps + [libgtk_css_dep, libgdk_dep, libgsk_dep],
-                        link_with: [libgtk_css, libgdk, libgsk, ],
-                        link_args: common_ldflags,
-                        install: true)
+libgtk = library('gtk-4',
+                 soversion: gtk_soversion,
+                 sources: [typefuncs, gtk_sources, gtkmarshal_h, gtkprivatetypebuiltins_h],
+                 c_args: gtk_cargs + common_cflags,
+                 include_directories: [confinc, gdkinc, gskinc, gtkinc],
+                 dependencies: gtk_deps + [libgtk_css_dep, libgdk_dep, libgsk_dep],
+                 link_with: [libgtk_css, libgdk, libgsk, ],
+                 link_args: common_ldflags,
+                 install: true)
 
 gtk_dep_sources = [gtkversion, gtktypebuiltins_h]
 # Introspection

testsuite/reftests/meson.build

@@ -1,9 +1,9 @@
 # FIXME: $(no_undefined) ?
-libgtkreftestprivate = shared_library('gtkreftestprivate',
+libgtkreftestprivate = library('gtkreftestprivate',
   'reftest-compare.c', 'reftest-module.c', 'reftest-snapshot.c',
   dependencies : libgtk_dep)
 
-libreftest = shared_library('reftest',
+libreftest = library('reftest',
   [ 'expand-expander.c',
     'frame-inhibitor.c',
     'letter-spacing.c',