unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
From: Julian Flake <flake@uni-koblenz.de>
To: 73428@debbugs.gnu.org
Cc: Julian Flake <flake@uni-koblenz.de>,
	Julian Flake <flake@uni-koblenz.de>,
	Julian Flake <julian@flake.de>
Subject: bug#73428: [PATCH v2 2/2] gnu: elogind: Remove unneeded rpath patch.
Date: Tue, 24 Sep 2024 07:18:34 +0200	[thread overview]
Message-ID: <89a8f197936641e628c2844348ca1a897df59f30.1727154987.git.flake@uni-koblenz.de> (raw)
In-Reply-To: <cover.1727154987.git.flake@uni-koblenz.de>

Change-Id: Id12590b45317a3d965ee4d715e696e5402de85e4
---
 gnu/local.mk                                 |  1 -
 gnu/packages/patches/elogind-fix-rpath.patch | 60 --------------------
 2 files changed, 61 deletions(-)
 delete mode 100644 gnu/packages/patches/elogind-fix-rpath.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 8e7abc8a47..dd5d6e0c85 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1170,7 +1170,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/elm-ghc9.2.patch	\
   %D%/packages/patches/elm-offline-package-registry.patch	\
   %D%/packages/patches/elm-reactor-static-files.patch		\
-  %D%/packages/patches/elogind-fix-rpath.patch			\
   %D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch	\
   %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch	\
   %D%/packages/patches/emacs-elpy-dup-test-name.patch		\
diff --git a/gnu/packages/patches/elogind-fix-rpath.patch b/gnu/packages/patches/elogind-fix-rpath.patch
deleted file mode 100644
index 2a76cc467f..0000000000
--- a/gnu/packages/patches/elogind-fix-rpath.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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
-- 
2.46.0





  parent reply	other threads:[~2024-09-24  5:20 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-22 18:50 bug#73428: update elogind to 255 Julian Flake
2024-09-23 21:43 ` bug#73428: [PATCH] elogind update to 252.24 Julian Flake
2024-09-23 21:58   ` bug#73428: update elogind to 255 Julian Flake
2024-09-24  8:59     ` Tobias Geerinckx-Rice via Bug reports for GNU Guix
2024-09-24  9:02       ` Tobias Geerinckx-Rice via Bug reports for GNU Guix
2024-09-24 10:34         ` Julian Flake
2024-09-24 19:29           ` Julian Flake
2024-09-24  5:18 ` bug#73428: [PATCH v2 0/2] removed reference to deleted patch Julian Flake
2024-09-24  5:18   ` bug#73428: [PATCH v2 1/2] gnu: elogind update to 252.24 Julian Flake
2024-09-24  5:18   ` Julian Flake [this message]
2024-09-24  5:37     ` bug#73428: update elogind to 255 Julian Flake

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=89a8f197936641e628c2844348ca1a897df59f30.1727154987.git.flake@uni-koblenz.de \
    --to=flake@uni-koblenz.de \
    --cc=73428@debbugs.gnu.org \
    --cc=julian@flake.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).