diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-01-15 13:50:57 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-01-15 14:06:12 +0100 |
| commit | ff985fad6dc6fe5d5a0785be372bb1aa3630a7d6 (patch) | |
| tree | 3273c78a2e5699e5b8c21d2792afecca71407e6c /gnu | |
| parent | 92fd8975a1c0b680f8ee1477b8f3b132cf3870dc (diff) | |
| download | guix-ff985fad6dc6fe5d5a0785be372bb1aa3630a7d6.tar.gz guix-ff985fad6dc6fe5d5a0785be372bb1aa3630a7d6.zip | |
gnu: zstd: Add missing slash in 'libzstd.pc'.
Fixes a regression introduced in
959a397d220ad49b5193feb84b036220313fb9c7, whereby directory names in
'libzstd.pc' would lack a slash after $prefix.
* gnu/packages/compression.scm (zstd)[arguments]: In
'adjust-library-locations' phase, add trailing slash for $prefix in .pc
file.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/compression.scm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 2693b7b5dc..d8d97b427e 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> @@ -1431,9 +1431,8 @@ or junctions, and always follows hard links.") ;; Make sure the pkg-config file refers to the right output. (substitute* (string-append shared-libs "/pkgconfig/libzstd.pc") (("^prefix=.*") - (string-append "prefix=" lib "\n"))) - - #t)))) + ;; Note: The .pc file expects a trailing slash for 'prefix'. + (string-append "prefix=" lib "/\n"))))))) #:make-flags (list ,(string-append "CC=" (cc-for-target)) (string-append "prefix=" (assoc-ref %outputs "out")) |