unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob 2a76cc467f3edec83a6e16da2ff82aeedef18ae6 2108 bytes (raw)
name: gnu/packages/patches/elogind-fix-rpath.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
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
 
Retrieved from https://github.com/elogind/elogind/issues/258

From: Mark Hindley <mark@hindley.org.uk>
Date: Wed, 24 May 2023 10:39:41 +0100
Subject: Fixup_executable_rpath

./meson.build sets

 install_rpath : rootlibexecdir

however src/shared/meson.build sets

libshared = shared_library(
          [snip]
        install_dir : rootpkglibdir
        )
---
 meson.build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index 694a2fd..a575f69 100644
--- a/meson.build
+++ b/meson.build
@@ -2903,7 +2903,7 @@ executable('elogind',
                 dependencies : [threads,
                                 libacl,
                                 libudev],
-                install_rpath : rootlibexecdir,
+                install_rpath : rootpkglibdir,
                 install : true,
                 install_dir : rootlibexecdir)
 
@@ -2913,7 +2913,7 @@ exe = executable('loginctl',
                         link_with : [libshared],
                         dependencies : [threads,
                                         libudev],
-                        install_rpath : rootlibexecdir,
+                        install_rpath : rootpkglibdir,
                         install : true,
                         install_dir : rootbindir)
 public_programs += [exe]
@@ -2923,7 +2923,7 @@ exe = executable('elogind-inhibit',
                         include_directories : includes,
                         link_with : [libshared],
                         dependencies : [threads],
-                        install_rpath : rootlibexecdir,
+                        install_rpath : rootpkglibdir,
                         install : true,
                         install_dir : rootbindir)
 public_programs += [exe]
@@ -4283,7 +4283,7 @@ executable('elogind-uaccess-command',
                         libshared],
            dependencies: [libacl,
                           libudev],
-           install_rpath : rootlibexecdir,
+           install_rpath : rootpkglibdir,
            install : true,
            install_dir : rootlibexecdir)
 #endif // 0

debug log:

solving 2a76cc467f ...
found 2a76cc467f 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).