~ruther/guix-local: gnu: zstd: Add missing slash in 'libzstd.pc'.

ff985fad6dc6fe5d5a0785be372bb1aa3630a7d6 — Ludovic Courtès 5 years ago 92fd897

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.

patch browse .tar.gz .zip

1 files changed, 3 insertions(+), 4 deletions(-)

M gnu/packages/compression.scm

M gnu/packages/compression.scm => gnu/packages/compression.scm +3 -4

@@ 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"))