union: Do not warn about "ld.so.cache" collisions.
This is a followup to f85efa86e7
.
* guix/build/union.scm (%harmless-collisions): Add "ld.so.cache".
This commit is contained in:
parent
1fb75128a5
commit
afe8c67ac1
1 changed files with 4 additions and 3 deletions
|
@ -1,5 +1,5 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2012, 2013, 2014, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2012, 2013, 2014, 2016, 2017, 2018, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
||||||
;;; Copyright © 2017 Huang Ying <huang.ying.caritas@gmail.com>
|
;;; Copyright © 2017 Huang Ying <huang.ying.caritas@gmail.com>
|
||||||
;;;
|
;;;
|
||||||
|
@ -99,8 +99,9 @@ identical, #f otherwise."
|
||||||
;; a warning doesn't make sense. For example, "icon-theme.cache" is
|
;; a warning doesn't make sense. For example, "icon-theme.cache" is
|
||||||
;; regenerated by a profile hook which shadows the file provided by
|
;; regenerated by a profile hook which shadows the file provided by
|
||||||
;; individual packages, and "gschemas.compiled" is made available to
|
;; individual packages, and "gschemas.compiled" is made available to
|
||||||
;; applications via 'glib-or-gtk-build-system'.
|
;; applications via 'glib-or-gtk-build-system'; "etc/ld.so.cache" is created
|
||||||
'("icon-theme.cache" "gschemas.compiled"))
|
;; for most packages.
|
||||||
|
'("icon-theme.cache" "gschemas.compiled" "ld.so.cache"))
|
||||||
|
|
||||||
(define (warn-about-collision files)
|
(define (warn-about-collision files)
|
||||||
"Handle the collision among FILES by emitting a warning and choosing the
|
"Handle the collision among FILES by emitting a warning and choosing the
|
||||||
|
|
Reference in a new issue