From 629200f48e18dc1a3a5229739748bad0e2a6a0a2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= <sleep_walker@suse.cz>
Date: Wed, 4 Feb 2015 11:37:16 +0100
Subject: [PATCH] Do not silently and prematurely end install when ldconfig is
 missing

---
 Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 343ecb5..4667146 100644
--- a/Makefile
+++ b/Makefile
@@ -112,9 +112,10 @@ install: $(INSTALL_DEP)
 	$(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
 	cd src && test -f $(FILE_SO) && \
 	  $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
-	  $(LDCONFIG) $(INSTALL_LIB) && \
-	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
-	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
+	  ( $(LDCONFIG) $(INSTALL_LIB) ; \
+	    $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
+	    $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || : \
+	  )
 	cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)
 	cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \
 	  $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
-- 
2.2.2

ad437aba96415865d67be617b8'>refs</a><a class='active' href='/guix/log/tests/cpan.scm'>log</a><a href='/guix/tree/tests/cpan.scm?id=89fbca9de61b97ad437aba96415865d67be617b8'>tree</a><a href='/guix/commit/tests/cpan.scm?id=89fbca9de61b97ad437aba96415865d67be617b8'>commit</a><a href='/guix/diff/tests/cpan.scm?id=89fbca9de61b97ad437aba96415865d67be617b8'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/cpan.scm'>
<input type='hidden' name='id' value='89fbca9de61b97ad437aba96415865d67be617b8'/><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=89fbca9de61b97ad437aba96415865d67be617b8'>root</a>/<a href='/guix/log/tests?id=89fbca9de61b97ad437aba96415865d67be617b8'>tests</a>/<a href='/guix/log/tests/cpan.scm?id=89fbca9de61b97ad437aba96415865d67be617b8'>cpan.scm</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/tests/cpan.scm?id=89fbca9de61b97ad437aba96415865d67be617b8&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-01-15 18:40:43 +0100'>2020-01-15</span></td><td><a href='/guix/commit/tests/cpan.scm?id=4aea90b1876179aab8d603a42533a6bdf97ccd3c'>import: cpan: Rewrite tests to use an HTTP server instead of mocking.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/import/cpan.scm (%metacpan-base-url): New variable.
(module-&gt;dist-name, cpan-fetch): Refer to it instead of the hard-coded URL.
* tests/cpan.scm ("cpan-&gt;guix-package"): Use 'with-http-server' instead
of 'mock'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-01-15 18:40:43 +0100'>2020-01-15</span></td><td><a href='/guix/commit/tests/cpan.scm?id=69f132554c6bd23df4610a21e636bde5f0578174'>import: cpan: Rewrite to use 'define-json-mapping'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/import/cpan.scm (&lt;cpan-dependency&gt;, &lt;cpan-release&gt;): New
JSON-mapped record types.
(metacpan-url-&gt;mirror-url): New procedure.
(cpan-source-url): Rewrite in terms of it.
(cpan-version): Remove.
(cpan-module-&gt;sexp): Rewrite to take a &lt;cpan-release&gt; instead of an
alist, and rename 'meta' to 'release'.
[convert-inputs]: Rewrite to use 'cpan-release-dependencies'.
Update calls to 'convert-inputs' to pass a list of symbols.
Replace 'assoc-ref' calls with the appropriate field accessors.
(cpan-&gt;guix-package): Rename 'module-meta' to 'release'.
(latest-release): Likewise, and use the appropriate accessors.
* tests/cpan.scm (test-json): Remove "prereqs" record; add "dependency"
list.
("source-url-http", "source-url-https"): Remove.
("metacpan-url-&gt;mirror-url, http")
("metacpan-url-&gt;mirror-url, https"): New tests.
</span></span></td><td>Ludovic Courtès</td></tr>