varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2025-12-31 20:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: allow using a host-installed sysprofd

Browse Source 
In case we are building in a flatpak, we might want to rely on a system
installed sysprofd. This means we might want to pretend we have sysprofd
support (to be found on the system), but not actually build sysprofd.
This commit is contained in:
Christian Hergert
2016-09-15 13:45:02 -07:00
parent fa25435388
commit c5ba20caeb
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Makefile.am
View File

@ -107,9 +107,9 @@ libsysprof_@API_VERSION@_la_LIBADD = \
$(GIO_LIBS) \
$(NULL)
if ENABLE_SYSPROFD
if ENABLE_POLKIT
libsysprof_@API_VERSION@_la_LIBADD += $(POLKIT_LIBS)
libsysprof_@API_VERSION@_la_CFLAGS += $(POLKIT_CFLAGS) -DENABLE_SYSPROFD
libsysprof_@API_VERSION@_la_CFLAGS += $(POLKIT_CFLAGS) -DENABLE_POLKIT
endif
libsysprof_@API_VERSION@_la_LDFLAGS = \

12
lib/sp-perf-counter.c
View File

@ -49,7 +49,7 @@
#include <sys/syscall.h>
#include <unistd.h>
#ifdef ENABLE_SYSPROFD
#ifdef ENABLE_POLKIT
# include <polkit/polkit.h>
#endif
@ -124,7 +124,7 @@ G_DEFINE_BOXED_TYPE (SpPerfCounter,
(GBoxedCopyFunc)sp_perf_counter_ref,
(GBoxedFreeFunc)sp_perf_counter_unref)
#ifdef ENABLE_SYSPROFD
#ifdef ENABLE_POLKIT
static GDBusConnection *shared_conn;
#endif
@ -420,7 +420,7 @@ sp_perf_counter_take_fd (SpPerfCounter *self,
sp_perf_counter_add_info (self, fd, -1);
}
#ifdef ENABLE_SYSPROFD
#ifdef ENABLE_POLKIT
static GDBusProxy *
get_proxy (void)
{
@ -641,7 +641,7 @@ sp_perf_counter_authorize_async (GCancellable *cancellable,
task = g_task_new (NULL, cancellable, callback, user_data);
#ifdef ENABLE_SYSPROFD
#ifdef ENABLE_POLKIT
g_bus_get (G_BUS_TYPE_SYSTEM,
cancellable,
sp_perf_counter_get_bus_cb,
@ -671,7 +671,7 @@ sp_perf_counter_open (SpPerfCounter *self,
gint group_fd,
gulong flags)
{
#ifdef ENABLE_SYSPROFD
#ifdef ENABLE_POLKIT
g_autoptr(GError) error = NULL;
g_autoptr(GDBusProxy) proxy = NULL;
g_autoptr(GUnixFDList) fdlist = NULL;
@ -694,7 +694,7 @@ sp_perf_counter_open (SpPerfCounter *self,
return ret;
}
#ifdef ENABLE_SYSPROFD
#ifdef ENABLE_POLKIT
params = g_variant_new_parsed (
"("
"["