From ff985fad6dc6fe5d5a0785be372bb1aa3630a7d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 15 Jan 2021 13:50:57 +0100 Subject: [PATCH] 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. --- gnu/packages/compression.scm | 7 +++---- 1 file 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 +;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer @@ -1431,9 +1431,8 @@ (define-public zstd ;; 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"))