[gnome-build-meta/abderrahim/sysprof: 4/5] sdk/{gjs, glib, gtk+-3, gtk, libsoup}.bst: build with sysprof support




commit 756c88e50929639890998da93f8afc2f029cadd1
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Sat Aug 1 10:10:51 2020 +0100

    sdk/{gjs,glib,gtk+-3,gtk,libsoup}.bst: build with sysprof support
    
    Fixes #294

 elements/core/mutter.bst     |  6 ++++--
 elements/core/sysprof.bst    | 12 ++++++++++++
 elements/sdk/gjs.bst         |  6 +++++-
 elements/sdk/glib.bst        |  7 +++++++
 elements/sdk/gtk+-3.bst      |  2 ++
 elements/sdk/gtk.bst         |  2 ++
 elements/sdk/libsoup-2.4.bst |  3 ++-
 elements/sdk/libsoup.bst     |  3 ++-
 8 files changed, 36 insertions(+), 5 deletions(-)
---
diff --git a/elements/core/mutter.bst b/elements/core/mutter.bst
index 67170b01..7e90eccf 100644
--- a/elements/core/mutter.bst
+++ b/elements/core/mutter.bst
@@ -6,8 +6,10 @@ sources:
   track: master
 
 build-depends:
-- sdk-deps/sysprof-minimal.bst
 - sdk/gtk-doc.bst
+# Need the whole thing over just the capture for the dbus interface.
+# /usr/share/dbus-1/interfaces/org.gnome.Sysprof3.Profiler.xml
+- core/sysprof.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 runtime-depends:
@@ -41,4 +43,4 @@ depends:
 variables:
   meson-local: >-
     -Dxwayland_initfd=disabled
-    -Dprofiler=false
+    -Dprofiler=true
diff --git a/elements/core/sysprof.bst b/elements/core/sysprof.bst
index de1f7436..2bb8c73b 100644
--- a/elements/core/sysprof.bst
+++ b/elements/core/sysprof.bst
@@ -14,3 +14,15 @@ depends:
 - sdk/gtk+-3.bst
 - freedesktop-sdk.bst:components/polkit.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
+
+public:
+  bst:
+    # This might overlap with sysprof-minimal as due to some pkgcofnig/meson
+    # quirkyness sysprof-capture ends up in Requires.private and now
+    # is a runtime dependency of glib so other modules can find the .pc file
+    # even though its a statically build build depency
+    # see: sdk/glib.bst
+    overlap-whitelist:
+    - '%{includedir}/sysprof-4/*.h'
+    - '%{libdir}/libsysprof-capture-4.a'
+    - '%{libdir}/pkgconfig/sysprof-capture-4.pc'
\ No newline at end of file
diff --git a/elements/sdk/gjs.bst b/elements/sdk/gjs.bst
index 28c1a977..60b57d7d 100644
--- a/elements/sdk/gjs.bst
+++ b/elements/sdk/gjs.bst
@@ -1,11 +1,14 @@
 kind: meson
+
 sources:
 - kind: git_tag
   url: gitlab_gnome_org:GNOME/gjs.git
   track: master
+
 build-depends:
 - sdk-deps/sysprof-minimal.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+
 depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
@@ -15,7 +18,8 @@ depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   meson-local: >-
-    -Dprofiler=disabled
+    -Dprofiler=enabled
+
 public:
   bst:
     split-rules:
diff --git a/elements/sdk/glib.bst b/elements/sdk/glib.bst
index 2c149a37..34875a91 100644
--- a/elements/sdk/glib.bst
+++ b/elements/sdk/glib.bst
@@ -15,6 +15,12 @@ runtime-depends:
 - freedesktop-sdk.bst:components/glib.bst
 
 depends:
+# sysprof-capture-4 ends up in Requires.private
+# so we either could have added sysprof-minimal
+# as a builddep to everything that depends on glib,
+# or make it a runtime depencency of glib as well.
+# https://github.com/mesonbuild/meson/issues/3970
+- sdk-deps/sysprof-minimal.bst
 - freedesktop-sdk.bst:components/libffi.bst
 - freedesktop-sdk.bst:components/util-linux.bst
 - freedesktop-sdk.bst:components/python3.bst
@@ -25,6 +31,7 @@ variables:
     -Dgtk_doc=false
     -Dinstalled-tests=true
     -Dselinux=disabled
+    -Dsysprof=enabled
 
 public:
   bst:
diff --git a/elements/sdk/gtk+-3.bst b/elements/sdk/gtk+-3.bst
index e0dddebd..8aa59318 100644
--- a/elements/sdk/gtk+-3.bst
+++ b/elements/sdk/gtk+-3.bst
@@ -6,6 +6,7 @@ sources:
   track: gtk-3-24
 
 build-depends:
+- sdk-deps/sysprof-minimal.bst
 - sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
@@ -46,6 +47,7 @@ variables:
     -Dman=true
     -Dintrospection=true
     -Dtracker3=true
+    -Dprofiler=true
 
 public:
   bst:
diff --git a/elements/sdk/gtk.bst b/elements/sdk/gtk.bst
index d2533b72..746246f9 100644
--- a/elements/sdk/gtk.bst
+++ b/elements/sdk/gtk.bst
@@ -7,6 +7,7 @@ sources:
 
 build-depends:
 - sdk-deps/sassc.bst
+- sdk-deps/sysprof-minimal.bst
 - sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
@@ -34,6 +35,7 @@ variables:
     -Dbroadway-backend=true
     -Dmedia-ffmpeg=disabled
     -Dprint-cloudprint=disabled
+    -Dprofiler=true
 
 public:
   bst:
diff --git a/elements/sdk/libsoup-2.4.bst b/elements/sdk/libsoup-2.4.bst
index 6744eec3..caba2804 100644
--- a/elements/sdk/libsoup-2.4.bst
+++ b/elements/sdk/libsoup-2.4.bst
@@ -6,6 +6,7 @@ sources:
   track: gnome-3-38
 
 build-depends:
+- sdk-deps/sysprof-minimal.bst
 - sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - sdk/vala.bst
@@ -29,7 +30,7 @@ variables:
     -Dtls_check=false
     -Dgtk_doc=true
     -Dntlm=disabled
-    -Dsysprof=disabled
+    -Dsysprof=enabled
 
 public:
   bst:
diff --git a/elements/sdk/libsoup.bst b/elements/sdk/libsoup.bst
index 1b79aaa9..e5f6c214 100644
--- a/elements/sdk/libsoup.bst
+++ b/elements/sdk/libsoup.bst
@@ -6,6 +6,7 @@ sources:
   track: master
 
 build-depends:
+- sdk-deps/sysprof-minimal.bst
 - sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - sdk/vala.bst
@@ -33,7 +34,7 @@ variables:
     -Dhttp2_tests=disabled
     -Dinstalled_tests=true
     -Dntlm=disabled
-    -Dsysprof=disabled
+    -Dsysprof=enabled
     -Dtls_check=false
 
 public:


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