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
makefiles, but we can't regenerate because current autotools carp on
some things, so we patch the Makefile.in instead.

Also fix to not try to create /var/lib/upower if /var isn't writable.

Based on a patch by Andy Wingo <wingo@igalia.com>
---
 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 \
+	if test -w $(DESTDIR)$(localstatedir)/; then \
 		mkdir -p $(DESTDIR)$(historydir); \
 	fi
 
-- 
2.32.0

>summary</a><a href='/guix/refs/?id=fbebccf7f6459a7543defbbdb98abd26e9ac56e6'>refs</a><a class='active' href='/guix/log/gnu/packages/ld-wrapper.in'>log</a><a href='/guix/tree/gnu/packages/ld-wrapper.in?id=fbebccf7f6459a7543defbbdb98abd26e9ac56e6'>tree</a><a href='/guix/commit/gnu/packages/ld-wrapper.in?id=fbebccf7f6459a7543defbbdb98abd26e9ac56e6'>commit</a><a href='/guix/diff/gnu/packages/ld-wrapper.in?id=fbebccf7f6459a7543defbbdb98abd26e9ac56e6'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/ld-wrapper.in'>
<input type='hidden' name='id' value='fbebccf7f6459a7543defbbdb98abd26e9ac56e6'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=fbebccf7f6459a7543defbbdb98abd26e9ac56e6'>root</a>/<a href='/guix/log/gnu?id=fbebccf7f6459a7543defbbdb98abd26e9ac56e6'>gnu</a>/<a href='/guix/log/gnu/packages?id=fbebccf7f6459a7543defbbdb98abd26e9ac56e6'>packages</a>/<a href='/guix/log/gnu/packages/ld-wrapper.in?id=fbebccf7f6459a7543defbbdb98abd26e9ac56e6'>ld-wrapper.in</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/ld-wrapper.in?id=fbebccf7f6459a7543defbbdb98abd26e9ac56e6&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-03-29 17:58:16 +0200'>2018-03-29</span></td><td><a href='/guix/commit/gnu/packages/ld-wrapper.in?id=d0a2db47fb550d684c47a0ae3b541a9a71727d9e'>ld-wrapper: Allow linking with non-store libraries by default.</a><span class='msg-avail'>...<span class='msg-tooltip'>This was suggested on several occasions, notably
&lt;https://bugs.gnu.org/24544&gt;.

* gnu/packages/ld-wrapper.in (%allow-impurities?): Default to #t and
parse the value of 'GUIX_LD_WRAPPER_ALLOW_IMPURITIES'.
* guix/build/gnu-build-system.scm (set-paths): Set
'GUIX_LD_WRAPPER_ALLOW_IMPURITIES'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-03-29 17:58:16 +0200'>2018-03-29</span></td><td><a href='/guix/commit/gnu/packages/ld-wrapper.in?id=1a5e07c3b56049d45be15e3f1ffbe81f2f1809ba'>ld-wrapper: Don't talk about "impure library".</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/ld-wrapper.in (rpath-arguments): Clarify message instead
of saying "impure library".
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-03-29 17:58:16 +0200'>2018-03-29</span></td><td><a href='/guix/commit/gnu/packages/ld-wrapper.in?id=6764538327a3ff24bc83ef731e9e74a9160981e2'>ld-wrapper: Make sure debugging output goes through.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/ld-wrapper.in (ld-wrapper): Add call to 'force-output'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-05-25 14:34:18 +0200'>2017-05-25</span></td><td><a href='/guix/commit/gnu/packages/ld-wrapper.in?id=696487d665a616dfdd09272a7bff0bea0e19375d'>ld-wrapper: Read arguments from "response files".</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;http://bugs.gnu.org/25882&gt;.
Reported by Federico Beffa &lt;beffa@fbengineering.ch&gt;.

* gnu/packages/ld-wrapper.in (expand-arguments): New procedure.
(ld-wrapper): Use it.
</span></span></td><td>Ludovic Courtès</td></tr>