unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob fa1fbc8783e60f865edab16e785930744a3d884d 1322 bytes (raw)
name: gnu/packages/patches/webkitgtk-libelogind.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
 
From 8d46803c09edc2b6d4e35c778a3d2f90e5baad0b Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Sat, 25 Mar 2023 22:55:16 -0400
Subject: [PATCH] Fallback to elogind when systemd is unavailable at build time
 https://bugs.webkit.org/show_bug.cgi?id=254475

Reviewed by NOBODY (OOPS!).

The build system supports elogind, but it only considers the
'libsystemd' library name for the pkg-config lookup and not
'libelogind'.  This change makes the build system fallback to search
for libelogind when libsystemd was not found.

* Source/cmake/FindJournald.cmake [!PC_SYSTEMD_FOUND]: Search for libelogind.
---
 Source/cmake/FindJournald.cmake | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Source/cmake/FindJournald.cmake b/Source/cmake/FindJournald.cmake
index 18dd6b50908c..e0dc9ce1d397 100644
--- a/Source/cmake/FindJournald.cmake
+++ b/Source/cmake/FindJournald.cmake
@@ -55,6 +55,10 @@ find_package(PkgConfig QUIET)
 
 # libelogind provides compatible pc and header files
 pkg_check_modules(PC_SYSTEMD QUIET libsystemd)
+if (NOT PC_SYSTEMD_FOUND)
+    pkg_check_modules(PC_SYSTEMD QUIET libelogind)
+endif ()
+
 set(Journald_COMPILE_OPTIONS ${PC_SYSTEMD_CFLAGS_OTHER})
 set(Journald_VERSION ${PC_SYSTEMD_VERSION})
 

base-commit: 43ea8744bc6065aad7ae5988e32d31d253905e5f
-- 
2.39.2


debug log:

solving fa1fbc8 ...
found fa1fbc8 in https://git.savannah.gnu.org/cgit/guix.git

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).