[libgweather/pgriffis/libsoup-ci: 1/3] build: Fix linking failure of tests
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgweather/pgriffis/libsoup-ci: 1/3] build: Fix linking failure of tests
- Date: Tue, 21 Sep 2021 16:50:50 +0000 (UTC)
commit 9b0befc3d6aea4e37a743d052ab7fa3c7aa5d0cc
Author: Patrick Griffis <pgriffis igalia com>
Date: Mon Sep 13 10:03:18 2021 -0500
build: Fix linking failure of tests
All of the test executables failed to build because of linking
failures missing gmodule symbols. This resolved that.
.gitlab-ci.yml | 25 ++++++++++++++++++++++++-
meson.build | 3 ++-
2 files changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6387602..7870dd2b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,28 @@
variables:
- LAST_ABI_BREAK: f1f0bdd9ab47ff8ddba17e2125802c928226da64
+ LAST_ABI_BREAK: f1f0bdd9ab47ff8ddba17e2125802c928226da64
+ COMMON_DEPS:
+ glibc-langpack-fr
+ redhat-rpm-config
+ meson
+ libxml2-devel
+ vala
+ gettext
+ itstool
+ gtk3-devel
+ geocode-glib-devel
+ gobject-introspection-devel
+ libsoup-devel
+ libabigail
+ git
+ python3-gobject
+ pylint
+ SOUP3_DEPS: # Includes deps for geocode-glib
+ gcc-c++
+ gtk-doc
+ json-glib-devel
+ libnghttp2-devel
+ sqlite-devel
+ libpsl-devel
build-fedora:
image: fedora:latest
diff --git a/meson.build b/meson.build
index d3dc3954..e3be9bd2 100644
--- a/meson.build
+++ b/meson.build
@@ -56,11 +56,12 @@ endif
c_compiler = meson.get_compiler('c')
gtk_dep = dependency('gtk+-3.0', version: gtk_req_version)
glib_dep = dependency('gio-2.0', version: glib_req_version)
+gmodule_dep = dependency('gmodule-2.0', version: glib_req_version)
libsoup_dep = dependency(libsoup_name, version: libsoup_req_version)
libxml_dep = dependency('libxml-2.0', version: libxml_req_version)
geocode_glib_dep = dependency('geocode-glib-1.0')
math_dep = c_compiler.find_library('m', required : false)
-deps_libgweather = [math_dep, gtk_dep, glib_dep, libsoup_dep, libxml_dep, geocode_glib_dep]
+deps_libgweather = [math_dep, gtk_dep, glib_dep, gmodule_dep, libsoup_dep, libxml_dep, geocode_glib_dep]
pylint = find_program('pylint-3', 'pylint3', 'pylint', required: false)
pylint_flags = ['-d', 'C0111', '-d', 'W0511', '-d', 'F0401', '-d', 'C0326' ]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]