gnu: findutils: Use /var as the localstatedir, for 'updatedb'.
* gnu/packages/patches/findutils-localstatedir.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/base.scm (findutils)[source]: Use it. [arguments]: Pass --localstatedir=/var.
This commit is contained in:
parent
696062b1f0
commit
67dfa1986d
|
@ -416,6 +416,7 @@ dist_patch_DATA = \
|
|||
gnu/packages/patches/emacs-exec-path.patch \
|
||||
gnu/packages/patches/eudev-rules-directory.patch \
|
||||
gnu/packages/patches/findutils-absolute-paths.patch \
|
||||
gnu/packages/patches/findutils-localstatedir.patch \
|
||||
gnu/packages/patches/flashrom-use-libftdi1.patch \
|
||||
gnu/packages/patches/flex-bison-tests.patch \
|
||||
gnu/packages/patches/gawk-shell.patch \
|
||||
|
|
|
@ -206,14 +206,20 @@ interactive means to merge two files.")
|
|||
(sha256
|
||||
(base32
|
||||
"0amn0bbwqvsvvsh6drfwz20ydc2czk374lzw5kksbh6bf78k4ks3"))
|
||||
(patches (list (search-patch "findutils-absolute-paths.patch")))))
|
||||
(patches (map search-patch
|
||||
'("findutils-absolute-paths.patch"
|
||||
"findutils-localstatedir.patch")))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
;; Work around cross-compilation failure.
|
||||
;; See <http://savannah.gnu.org/bugs/?27299#comment1>.
|
||||
(if (%current-target-system)
|
||||
'(#:configure-flags '("gl_cv_func_wcwidth_works=yes"))
|
||||
'()))
|
||||
`(#:configure-flags (list
|
||||
;; Tell 'updatedb' to write to /var.
|
||||
"--localstatedir=/var"
|
||||
|
||||
;; Work around cross-compilation failure. See
|
||||
;; <http://savannah.gnu.org/bugs/?27299#comment1>.
|
||||
,@(if (%current-target-system)
|
||||
'("gl_cv_func_wcwidth_works=yes")
|
||||
'()))))
|
||||
(synopsis "Operating on files matching given criteria")
|
||||
(description
|
||||
"Findutils supplies the basic file directory searching utilities of the
|
||||
|
|
|
@ -0,0 +1,14 @@
|
|||
Do not try to create $localstatedir (aka. /var) since we don't have
|
||||
write access.
|
||||
|
||||
--- findutils-4.4.2/locate/Makefile.in 2015-06-04 12:40:52.690935795 +0200
|
||||
+++ findutils-4.4.2/locate/Makefile.in 2015-06-04 12:41:32.087286685 +0200
|
||||
@@ -1212,7 +1212,7 @@ updatedb: updatedb.sh Makefile
|
||||
chmod +x $@
|
||||
|
||||
install-data-hook:
|
||||
- $(top_srcdir)/build-aux/mkinstalldirs $(DESTDIR)$(localstatedir)
|
||||
+ true
|
||||
|
||||
dblocation.texi: Makefile
|
||||
echo '@set LOCATE_DB $(LOCATE_DB)' > $@
|
Loading…
Reference in New Issue