me/guix
Archived
1
0
Fork 0
Code Activity

gnu: zstd: Add missing slash in 'libzstd.pc'.

Browse source 
Fixes a regression introduced in
959a397d22, 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.
This commit is contained in:
Ludovic Courtès 2021-01-15 13:50:57 +01:00
parent 92fd8975a1
commit ff985fad6d
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gnu/packages/compression.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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 © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; 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. ;; Make sure the pkg-config file refers to the right output.
(substitute* (string-append shared-libs "/pkgconfig/libzstd.pc") (substitute* (string-append shared-libs "/pkgconfig/libzstd.pc")
(("^prefix=.*") (("^prefix=.*")
(string-append "prefix=" lib "\n"))) ;; Note: The .pc file expects a trailing slash for 'prefix'.
(string-append "prefix=" lib "/\n")))))))
#t))))
#:make-flags #:make-flags
(list ,(string-append "CC=" (cc-for-target)) (list ,(string-append "CC=" (cc-for-target))
(string-append "prefix=" (assoc-ref %outputs "out")) (string-append "prefix=" (assoc-ref %outputs "out"))