[gnome-software] plugins: Fix undefined references



commit 3647d9ee8671a82fbe3e813e59c1a5ffe9955284
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Fri Dec 21 19:21:11 2018 -0500

    plugins: Fix undefined references
    
    Be sure to link against libgnomesoftware to fix build
    with -Wl,-z,defs

 plugins/core/meson.build                     | 68 ++++++++++++++++++++++------
 plugins/dpkg/meson.build                     |  5 +-
 plugins/dummy/meson.build                    |  5 +-
 plugins/epiphany/meson.build                 |  5 +-
 plugins/external-appstream/meson.build       |  5 +-
 plugins/fedora-pkgdb-collections/meson.build |  3 ++
 plugins/flatpak/meson.build                  |  3 ++
 plugins/fwupd/meson.build                    |  5 +-
 plugins/modalias/meson.build                 |  5 +-
 plugins/odrs/meson.build                     |  5 +-
 plugins/packagekit/meson.build               | 61 ++++++++++++++++++++-----
 plugins/repos/meson.build                    |  5 +-
 plugins/rpm-ostree/meson.build               |  5 +-
 plugins/shell-extensions/meson.build         |  3 ++
 plugins/snap/meson.build                     |  5 +-
 15 files changed, 153 insertions(+), 35 deletions(-)
---
diff --git a/plugins/core/meson.build b/plugins/core/meson.build
index 599d2bb2..0c935b46 100644
--- a/plugins/core/meson.build
+++ b/plugins/core/meson.build
@@ -10,7 +10,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : plugin_libs
+  dependencies : plugin_libs,
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 shared_module(
@@ -23,7 +26,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : plugin_libs
+  dependencies : plugin_libs,
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 shared_module(
@@ -36,7 +42,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : plugin_libs
+  dependencies : plugin_libs,
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 shared_module(
@@ -49,7 +58,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : plugin_libs
+  dependencies : plugin_libs,
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 shared_module(
@@ -62,7 +74,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : plugin_libs
+  dependencies : plugin_libs,
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 
@@ -76,7 +91,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : plugin_libs
+  dependencies : plugin_libs,
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 shared_module(
@@ -96,6 +114,9 @@ shared_module(
     plugin_libs,
     libxmlb,
   ],
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 shared_module(
@@ -111,7 +132,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : plugin_libs
+  dependencies : plugin_libs,
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 shared_module(
@@ -127,7 +151,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : plugin_libs
+  dependencies : plugin_libs,
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 shared_module(
@@ -140,7 +167,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : plugin_libs
+  dependencies : plugin_libs,
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 shared_module(
@@ -153,7 +183,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : plugin_libs
+  dependencies : plugin_libs,
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 shared_module(
@@ -166,7 +199,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : plugin_libs
+  dependencies : plugin_libs,
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 shared_module(
@@ -179,7 +215,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : plugin_libs
+  dependencies : plugin_libs,
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 shared_module(
@@ -192,7 +231,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : plugin_libs
+  dependencies : plugin_libs,
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 if get_option('tests')
diff --git a/plugins/dpkg/meson.build b/plugins/dpkg/meson.build
index 97ff649b..050cdf50 100644
--- a/plugins/dpkg/meson.build
+++ b/plugins/dpkg/meson.build
@@ -10,7 +10,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : plugin_libs
+  dependencies : plugin_libs,
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 if get_option('tests')
diff --git a/plugins/dummy/meson.build b/plugins/dummy/meson.build
index 1259c330..93640df0 100644
--- a/plugins/dummy/meson.build
+++ b/plugins/dummy/meson.build
@@ -12,7 +12,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : [appstream_glib, gio_unix, goa, gtk, libsoup]
+  dependencies : [appstream_glib, gio_unix, goa, gtk, libsoup],
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 if get_option('tests')
diff --git a/plugins/epiphany/meson.build b/plugins/epiphany/meson.build
index 9c2bfa6a..5fe15a96 100644
--- a/plugins/epiphany/meson.build
+++ b/plugins/epiphany/meson.build
@@ -12,7 +12,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : plugin_libs
+  dependencies : plugin_libs,
+  link_with : [
+    libgnomesoftware
+  ]
 )
 metainfo = 'org.gnome.Software.Plugin.Epiphany.metainfo.xml'
 
diff --git a/plugins/external-appstream/meson.build b/plugins/external-appstream/meson.build
index 95897252..2252c7d5 100644
--- a/plugins/external-appstream/meson.build
+++ b/plugins/external-appstream/meson.build
@@ -31,5 +31,8 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : [gio_unix, appstream_glib, libsoup, plugin_libs]
+  dependencies : [gio_unix, appstream_glib, libsoup, plugin_libs],
+  link_with : [
+    libgnomesoftware
+  ]
 )
diff --git a/plugins/fedora-pkgdb-collections/meson.build b/plugins/fedora-pkgdb-collections/meson.build
index 9058572a..ae093ba5 100644
--- a/plugins/fedora-pkgdb-collections/meson.build
+++ b/plugins/fedora-pkgdb-collections/meson.build
@@ -11,4 +11,7 @@ shared_module(
   install_dir: plugin_dir,
   c_args : cargs,
   dependencies : plugin_libs,
+  link_with : [
+    libgnomesoftware
+  ]
 )
diff --git a/plugins/flatpak/meson.build b/plugins/flatpak/meson.build
index ac82bfc0..5a93297e 100644
--- a/plugins/flatpak/meson.build
+++ b/plugins/flatpak/meson.build
@@ -24,6 +24,9 @@ shared_module(
     flatpak,
     libxmlb,
   ],
+  link_with : [
+    libgnomesoftware
+  ]
 )
 metainfo = 'org.gnome.Software.Plugin.Flatpak.metainfo.xml'
 
diff --git a/plugins/fwupd/meson.build b/plugins/fwupd/meson.build
index 9ba56dd3..bf3c7e86 100644
--- a/plugins/fwupd/meson.build
+++ b/plugins/fwupd/meson.build
@@ -14,7 +14,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : [ plugin_libs, fwupd ]
+  dependencies : [ plugin_libs, fwupd ],
+  link_with : [
+    libgnomesoftware
+  ]
 )
 metainfo = 'org.gnome.Software.Plugin.Fwupd.metainfo.xml'
 
diff --git a/plugins/modalias/meson.build b/plugins/modalias/meson.build
index aaa507ae..fd6c8906 100644
--- a/plugins/modalias/meson.build
+++ b/plugins/modalias/meson.build
@@ -13,7 +13,10 @@ sources : 'gs-plugin-modalias.c',
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : [ plugin_libs, gudev ]
+  dependencies : [ plugin_libs, gudev ],
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 if get_option('tests')
diff --git a/plugins/odrs/meson.build b/plugins/odrs/meson.build
index 28de57a4..254530d3 100644
--- a/plugins/odrs/meson.build
+++ b/plugins/odrs/meson.build
@@ -10,7 +10,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : plugin_libs
+  dependencies : plugin_libs,
+  link_with : [
+    libgnomesoftware
+  ]
 )
 metainfo = 'org.gnome.Software.Plugin.Odrs.metainfo.xml'
 
diff --git a/plugins/packagekit/meson.build b/plugins/packagekit/meson.build
index 566dc799..e737b40c 100644
--- a/plugins/packagekit/meson.build
+++ b/plugins/packagekit/meson.build
@@ -15,7 +15,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : [ plugin_libs, packagekit ]
+  dependencies : [ plugin_libs, packagekit ],
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 shared_module(
@@ -32,7 +35,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : [ plugin_libs, packagekit ]
+  dependencies : [ plugin_libs, packagekit ],
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 shared_module(
@@ -50,7 +56,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : [ plugin_libs, packagekit ]
+  dependencies : [ plugin_libs, packagekit ],
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 shared_module(
@@ -67,7 +76,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : [ plugin_libs, packagekit ]
+  dependencies : [ plugin_libs, packagekit ],
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 shared_module(
@@ -84,7 +96,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : [ plugin_libs, packagekit ]
+  dependencies : [ plugin_libs, packagekit ],
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 shared_module(
@@ -101,7 +116,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : [ plugin_libs, packagekit ]
+  dependencies : [ plugin_libs, packagekit ],
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 shared_module(
@@ -117,7 +135,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : [ plugin_libs, packagekit ]
+  dependencies : [ plugin_libs, packagekit ],
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 shared_module(
@@ -134,12 +155,18 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : [ plugin_libs, packagekit ]
+  dependencies : [ plugin_libs, packagekit ],
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 shared_module(
   'gs_plugin_packagekit-offline',
-sources : 'gs-plugin-packagekit-offline.c',
+sources : [
+    'gs-plugin-packagekit-offline.c',
+    'packagekit-common.c',
+  ],
   include_directories : [
     include_directories('../..'),
     include_directories('../../lib'),
@@ -147,7 +174,10 @@ sources : 'gs-plugin-packagekit-offline.c',
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : [ plugin_libs, packagekit ]
+  dependencies : [ plugin_libs, packagekit ],
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 shared_module(
@@ -160,7 +190,11 @@ sources : 'gs-plugin-packagekit-proxy.c',
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : [ plugin_libs, packagekit ])
+  dependencies : [ plugin_libs, packagekit ],
+  link_with : [
+    libgnomesoftware
+  ]
+)
 
 shared_module(
   'gs_plugin_packagekit-url-to-app',
@@ -176,7 +210,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : [ plugin_libs, packagekit ]
+  dependencies : [ plugin_libs, packagekit ],
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 if get_option('tests')
diff --git a/plugins/repos/meson.build b/plugins/repos/meson.build
index 8b71c871..356ad0ef 100644
--- a/plugins/repos/meson.build
+++ b/plugins/repos/meson.build
@@ -11,7 +11,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : plugin_libs
+  dependencies : plugin_libs,
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 if get_option('tests')
diff --git a/plugins/rpm-ostree/meson.build b/plugins/rpm-ostree/meson.build
index 1872e89a..8cf509db 100644
--- a/plugins/rpm-ostree/meson.build
+++ b/plugins/rpm-ostree/meson.build
@@ -18,5 +18,8 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : [ plugin_libs, ostree, rpm_ostree ]
+  dependencies : [ plugin_libs, ostree, rpm_ostree ],
+  link_with : [
+    libgnomesoftware
+  ]
 )
diff --git a/plugins/shell-extensions/meson.build b/plugins/shell-extensions/meson.build
index d30ebc5b..ee571e56 100644
--- a/plugins/shell-extensions/meson.build
+++ b/plugins/shell-extensions/meson.build
@@ -18,6 +18,9 @@ shared_module(
     plugin_libs,
     libxmlb,
   ],
+  link_with : [
+    libgnomesoftware
+  ]
 )
 
 if get_option('tests')
diff --git a/plugins/snap/meson.build b/plugins/snap/meson.build
index 41f2c7cb..ccaff96c 100644
--- a/plugins/snap/meson.build
+++ b/plugins/snap/meson.build
@@ -12,7 +12,10 @@ shared_module(
   install : true,
   install_dir: plugin_dir,
   c_args : cargs,
-  dependencies : [ plugin_libs, snap ]
+  dependencies : [ plugin_libs, snap ],
+  link_with : [
+    libgnomesoftware
+  ]
 )
 metainfo = 'org.gnome.Software.Plugin.Snap.metainfo.xml'
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]