diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-07-18 16:05:21 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-07-18 19:50:01 +0200 |
| commit | 0e47fcced442d8e7c1b05184fdc1c14f10ed04ec (patch) | |
| tree | 4ae844bc0ec3c670f8697bdc24362c122fa718ad /gnu/packages/patches/upower-builddir.patch | |
| parent | e4b70bc55a538569465bcedee19d1f2607308e65 (diff) | |
| parent | 8b1bde7bb3936a64244824500ffe60f123704437 (diff) | |
| download | guix-patches-0e47fcced442d8e7c1b05184fdc1c14f10ed04ec.tar guix-patches-0e47fcced442d8e7c1b05184fdc1c14f10ed04ec.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/upower-builddir.patch')
| -rw-r--r-- | gnu/packages/patches/upower-builddir.patch | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/gnu/packages/patches/upower-builddir.patch b/gnu/packages/patches/upower-builddir.patch index 51295f2076..a61d387faf 100644 --- a/gnu/packages/patches/upower-builddir.patch +++ b/gnu/packages/patches/upower-builddir.patch @@ -1,3 +1,8 @@ +From 27ae011b31d831752b97eb209bc2b2206fcf40f7 Mon Sep 17 00:00:00 2001 +From: Tobias Geerinckx-Rice <me@tobias.gr> +Date: Mon, 28 Jun 2021 11:58:47 +0200 +Subject: [PATCH] gnu: upower: Fix build directory. + Remove explicit set of UPOWER_CONF_FILE_NAME in up-self-test.c; instead the harness should set it. In Guix we set it explicitly; the right thing is to use AM_TEST_ENVIRONMENT and regenerate the @@ -6,13 +11,17 @@ some things, so we patch the Makefile.in instead. Also fix to not try to create /var/lib/upower if /var isn't writable. -Patch by Andy Wingo <wingo@igalia.com> -Reduced to upower 0.99.10 by Tobias Geerinckx-Rice <me@tobias.gr> +Based on a patch by Andy Wingo <wingo@igalia.com> +--- + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) ---- upower-0.99.2.orig/src/Makefile.in 2014-12-18 10:32:01.000000000 +0100 -+++ upower-0.99.2/src/Makefile.in 2015-04-04 19:49:28.020843678 +0200 -@@ -1789,7 +1790,7 @@ - @HAVE_SYSTEMDSYSTEMUNITDIR_TRUE@ @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 3400139..f51ee89 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -181,7 +181,7 @@ $(systemdservice_DATA): $(systemdservice_in_files) Makefile + endif install-data-hook: - if test -w $(DESTDIR)$(prefix)/; then \ @@ -20,3 +29,6 @@ Reduced to upower 0.99.10 by Tobias Geerinckx-Rice <me@tobias.gr> mkdir -p $(DESTDIR)$(historydir); \ fi +-- +2.32.0 + |