This is an automated email from the git hooks/post-receive script.
efraim pushed a commit to branch core-updates-frozen
in repository guix.
The following commit(s) were added to refs/heads/core-updates-frozen by this
push:
new c820ec7 gnu: libchop: Don't append to CPATH unconditionally.
c820ec7 is described below
commit c820ec77aecc551914a51e3d0c0c7a84b244e7aa
Author: Efraim Flashner <[email protected]>
AuthorDate: Mon Aug 30 12:34:52 2021 +0300
gnu: libchop: Don't append to CPATH unconditionally.
* gnu/packages/backup.scm (libchop)[arguments]: Adjust
'set-libtirpc-include-path to return a valid CPATH.
---
gnu/packages/backup.scm | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index e07fab3..de85c36 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2017 Thomas Danckaert <[email protected]>
;;; Copyright © 2017 Arun Isaac <[email protected]>
;;; Copyright © 2017 Kei Kebreau <[email protected]>
-;;; Copyright © 2017, 2020 Efraim Flashner <[email protected]>
+;;; Copyright © 2017, 2020, 2021 Efraim Flashner <[email protected]>
;;; Copyright © 2017 Christopher Allan Webber <[email protected]>
;;; Copyright © 2017 Rutger Helling <[email protected]>
;;; Copyright © 2018 Mark H Weaver <[email protected]>
@@ -578,24 +578,23 @@ rsnapshot uses hard links to deduplicate identical
files.")
(substitute* "configure"
(("GUILE=(.*)--variable bindir`" _ middle)
(string-append "GUILE=" middle
- "--variable bindir`/guile")))
- #t))
+ "--variable bindir`/guile")))))
(add-before 'build 'set-libtirpc-include-path
(lambda* (#:key inputs #:allow-other-keys)
;; Allow <rpc/rpc.h> & co. to be found.
- (let ((libtirpc (assoc-ref inputs "libtirpc")))
- (setenv "CPATH"
- (string-append (getenv "CPATH")
- ":" libtirpc
- "/include/tirpc"))
- #t)))
+ (let ((tirpc (string-append (assoc-ref inputs "libtirpc")
+ "/include/tirpc")))
+ (if (getenv "CPATH")
+ (setenv "CPATH"
+ (string-append (getenv "CPATH")
+ ":" tirpc))
+ (setenv "CPATH" tirpc)))))
(add-before 'check 'skip-test
(lambda _
;; XXX: This test fails (1) because current GnuTLS no
;; longer supports OpenPGP authentication, and (2) for
;; some obscure reason. Better skip it.
- (setenv "XFAIL_TESTS" "utils/block-server")
- #t)))))
+ (setenv "XFAIL_TESTS" "utils/block-server"))))))
(native-inputs
`(("guile" ,guile-2.0)
("gperf" ,gperf-3.0) ;see <https://bugs.gnu.org/32382>
