[glib-networking] Meson: Remove workaround for a bug fixed a long time ago
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking] Meson: Remove workaround for a bug fixed a long time ago
- Date: Fri, 12 Aug 2022 14:43:26 +0000 (UTC)
commit 96b6e734746b8a1b86dda77c61dbe371c7f0d010
Author: Xavier Claessens <xavier claessens collabora com>
Date: Thu Jun 23 10:51:38 2022 -0400
Meson: Remove workaround for a bug fixed a long time ago
tls/gnutls/meson.build | 3 ---
tls/openssl/meson.build | 3 ---
2 files changed, 6 deletions(-)
---
diff --git a/tls/gnutls/meson.build b/tls/gnutls/meson.build
index 9d7b1637..3cd28568 100644
--- a/tls/gnutls/meson.build
+++ b/tls/gnutls/meson.build
@@ -33,13 +33,10 @@ module = shared_module(
)
if get_option('static_modules') or get_option('default_library') != 'shared'
- # link_whole is a workaround for a meson bug
- # https://github.com/mesonbuild/meson/pull/3939
giognutls_lib = static_library('giognutls',
objects: module.extract_all_objects(recursive: true),
install: true,
install_dir: gio_module_dir,
- link_whole: [tlsbase]
)
pkg.generate(module)
diff --git a/tls/openssl/meson.build b/tls/openssl/meson.build
index 43d78c24..d0e22b48 100644
--- a/tls/openssl/meson.build
+++ b/tls/openssl/meson.build
@@ -46,13 +46,10 @@ module = shared_module(
)
if get_option('static_modules') or get_option('default_library') != 'shared'
- # link_whole is a workaround for a meson bug
- # https://github.com/mesonbuild/meson/pull/3939
gioopenssl_lib = static_library('gioopenssl',
objects: module.extract_all_objects(recursive: true),
install: true,
install_dir: gio_module_dir,
- link_whole: [tlsbase]
)
pkg.generate(module)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]