[gjs: 2/3] build: Add requirement on sysprof 3.33.2



commit 95a20cb76915e4083c5c04405565a3541f224434
Author: Olivier Fourdan <ofourdan redhat com>
Date:   Tue Jun 25 10:00:39 2019 +0200

    build: Add requirement on sysprof 3.33.2
    
    Profiling requires sysprof 3.33.2 because it uses a newer API recently
    introduced in sysprof: `sysprof_capture_writer_set_flush_delay()`
    
    The configure script does not check for the sysprof version and using an
    older version of sysprof will cause a build failure later on:
    
    ```
    gjs/profiler.cpp:445:5: error: ‘sysprof_capture_writer_set_flush_delay’
    was not declared in this scope; did you mean ‘sysprof_capture_writer_set_counters’?
      445 |     sysprof_capture_writer_set_flush_delay(self->capture,
          |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
          |     sysprof_capture_writer_set_counters
      CC       libgjs-private/libgjs_la-gjs-gtk-util.lo
    make[1]: *** [Makefile:2543: gjs/libgjs_la-profiler.lo] Error 1
    make[1]: *** Waiting for unfinished jobs....
    ```
    
    Add an explicit dependency on sysprof 3.33.2 to avoid the build failure.
    
    https://gitlab.gnome.org/GNOME/gjs/issues/258

 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/configure.ac b/configure.ac
index 2cec273d..ee3795e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,6 +71,7 @@ common_packages="gthread-2.0 gio-2.0 >= glib_required_version mozjs-60"
 gjs_packages="gobject-introspection-1.0 libffi $common_packages"
 gjs_cairo_packages="cairo cairo-gobject $common_packages"
 gjs_gtk_packages="gtk+-3.0 >= 3.20"
+gjs_sysprof_packages="sysprof-capture-3 >= 3.33.2"
 
 AX_PKG_CHECK_MODULES([GJS], [$GOBJECT_REQUIREMENT], [$gjs_packages])
 dnl These don't need to be put in the .pc file so use regular PKG_CHECK_MODULES
@@ -154,7 +155,7 @@ AC_ARG_ENABLE([profiler],
 
 # Use sysprof-capture-3 for profiler
 PKG_CHECK_MODULES([SYSPROF_CAPTURE],
-                  [sysprof-capture-3],
+                  [$gjs_sysprof_packages],
                   [have_sysprof_capture=yes],
                   [have_sysprof_capture=no])
 AC_SUBST([SYSPROF_CAPTURE_CFLAGS])


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