me
/
guix
Archived
1
0
Fork 0
Code

gnu: libchop: Don't append to CPATH unconditionally. 

* gnu/packages/backup.scm (libchop)[arguments]: Adjust
'set-libtirpc-include-path to return a valid CPATH.
master
Efraim Flashner 2021-08-30 12:34:52 +03:00
parent 3fced772e3
commit c820ec77ae
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnu/packages/backup.scm
View File

@ -6,7 +6,7 @@
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2017 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
@ -578,24 +578,23 @@ rsnapshot uses hard links to deduplicate identical files.")
(substitute* "configure" (substitute* "configure"
(("GUILE=(.*)--variable bindir`" _ middle) (("GUILE=(.*)--variable bindir`" _ middle)
(string-append "GUILE=" middle (string-append "GUILE=" middle
"--variable bindir`/guile"))) "--variable bindir`/guile")))))
#t))
(add-before 'build 'set-libtirpc-include-path (add-before 'build 'set-libtirpc-include-path
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Allow <rpc/rpc.h> & co. to be found. ;; Allow <rpc/rpc.h> & co. to be found.
(let ((libtirpc (assoc-ref inputs "libtirpc"))) (let ((tirpc (string-append (assoc-ref inputs "libtirpc")
(setenv "CPATH" "/include/tirpc")))
(string-append (getenv "CPATH") (if (getenv "CPATH")
":" libtirpc (setenv "CPATH"
"/include/tirpc")) (string-append (getenv "CPATH")
#t))) ":" tirpc))
(setenv "CPATH" tirpc)))))
(add-before 'check 'skip-test (add-before 'check 'skip-test
(lambda _ (lambda _
;; XXX: This test fails (1) because current GnuTLS no ;; XXX: This test fails (1) because current GnuTLS no
;; longer supports OpenPGP authentication, and (2) for ;; longer supports OpenPGP authentication, and (2) for
;; some obscure reason. Better skip it. ;; some obscure reason. Better skip it.
(setenv "XFAIL_TESTS" "utils/block-server") (setenv "XFAIL_TESTS" "utils/block-server"))))))
#t)))))
(native-inputs (native-inputs
`(("guile" ,guile-2.0) `(("guile" ,guile-2.0)
("gperf" ,gperf-3.0) ;see <https://bugs.gnu.org/32382> ("gperf" ,gperf-3.0) ;see <https://bugs.gnu.org/32382>