From patchwork Tue Sep 15 15:11:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 24155 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CCED927BBE8; Tue, 15 Sep 2020 16:21:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, HTML_MESSAGE,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 47FCD27BBE7 for ; Tue, 15 Sep 2020 16:21:18 +0100 (BST) Received: from localhost ([::1]:55202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIClh-0004No-GT for patchwork@mira.cbaines.net; Tue, 15 Sep 2020 11:21:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41734) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kICck-0004gv-6Y for guix-patches@gnu.org; Tue, 15 Sep 2020 11:12:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48626) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kICcj-0000iW-PO for guix-patches@gnu.org; Tue, 15 Sep 2020 11:12:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kICcj-00074J-Jd for guix-patches@gnu.org; Tue, 15 Sep 2020 11:12:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43427] [PATCH] gnu: zstd: Update to 1.4.5. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 15 Sep 2020 15:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43427 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43427@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160018270927148 (code B ref -1); Tue, 15 Sep 2020 15:12:01 +0000 Received: (at submit) by debbugs.gnu.org; 15 Sep 2020 15:11:49 +0000 Received: from localhost ([127.0.0.1]:60172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kICcW-00073n-PF for submit@debbugs.gnu.org; Tue, 15 Sep 2020 11:11:49 -0400 Received: from lists.gnu.org ([209.51.188.17]:58834) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kICcU-00073e-B8 for submit@debbugs.gnu.org; Tue, 15 Sep 2020 11:11:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kICcU-0004RM-3K for guix-patches@gnu.org; Tue, 15 Sep 2020 11:11:46 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:51549) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kICcQ-0000bA-91 for guix-patches@gnu.org; Tue, 15 Sep 2020 11:11:45 -0400 Received: by mail-wm1-x331.google.com with SMTP id w2so3743316wmi.1 for ; Tue, 15 Sep 2020 08:11:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=vS7BSCRg0GmqMfxioB54+xPmiqQvhWPwRvLkMPVV5FU=; b=qSuf4xhSwsd1gspxAl2C1vj2ocvQihZwaklLPYUwq5B94eaN0yTylD6eM5FOu1qyS7 Dak9uSbHfE8XTW8dMUDeeSKOOn6HZObGECqCzwSKYinI5oVW5gPLDCGwyp061AGYGaG1 t7oFe/xw0t0HRMewF/b10RwNRzai+F0EbxsBGLFNA89j+cYJow2RxaANvkVdaLAnXkXn jqQ1lnQ2dYsQyrMVYgGJCPg1OzviMVwygXZhospXq5YW/MGf8inSj87nylRy+sl3Qca7 e1OCqcNXxCtW2q5QoJPwbPZy5w0j6cL1r2qvQ+tf9P+oDsjI5AEIpC+ODek++qlyzohk QcDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=vS7BSCRg0GmqMfxioB54+xPmiqQvhWPwRvLkMPVV5FU=; b=MyqMYMAFgnc7buw+I11oJwixUgg4CNdkWPoEYxgGfn3JOu/0Nqr4bo7bmje3NEAe40 vFaz0mHl0Q2CV+4WXTh1ybSqryo+O77NN+j2yCSyn5MMiPFPqPa4S8/XSVJBhrryF0MT iV8vwAYooaBkMy4RXpOXkEurajvBNId3pIVXKvCYfII/YE8yX+HyCowFYrSihyNAp/j5 E5dLSFB5AZ5rInzoRQxXwO0gx5mq0YgFbS6zLaOSLYbjvr1eGfVlXxELXgGyfLjVVQoi OKw9In/EAc8WW6dC2QdlAcXiCmu6oEk/NatHAEFGpbUsjhztCXJc2wefQTtczgKRObI/ C7Aw== X-Gm-Message-State: AOAM531GYA7CF31gxNfYNzLtU47Bp3rXoBXhmLjT+JLx3WzT17plj+A6 m4jMukUFFOhGZqy8Vl7ppe5jG7RQZnpgK413yjFtDw858bw+DvOD46g= X-Google-Smtp-Source: ABdhPJz2rWFBquHwJqt87R+DoLZehFlTPx7ROIP/cmoTWr/BfFWs9Ap6P7RibHNQHtjO/EqR96UwVFGOZDFosmeexkY= X-Received: by 2002:a1c:f608:: with SMTP id w8mr5513401wmc.161.1600182699998; Tue, 15 Sep 2020 08:11:39 -0700 (PDT) MIME-Version: 1.0 From: Greg Hogan Date: Tue, 15 Sep 2020 11:11:28 -0400 Message-ID: Received-SPF: none client-ip=2a00:1450:4864:20::331; envelope-from=code@greghogan.com; helo=mail-wm1-x331.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From 3875f9c53d6aa9a3c97e0187ab614f44fcf04acf Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 15 Sep 2020 14:06:48 +0000 Subject: [PATCH] gnu: zstd: Update to 1.4.5. * gnu/packages/compression.scm (zstd): Update to 1.4.5. set pkg-config paths in make-flags (see zstd@e668c9b5). --- gnu/packages/compression.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) documentation "lib" ;1.2MiB shared library and headers @@ -1425,6 +1425,11 @@ or junctions, and always follows hard links.") (string-append "PREFIX=" (assoc-ref %outputs "out")) (string-append "LIBDIR=" (assoc-ref %outputs "lib") "/lib") (string-append "INCLUDEDIR=" (assoc-ref %outputs "lib") "/include") + ;; Hard-code the relative paths written to the pkg-config file. + ;; zstd's lib/Makefile expects the exec path ("out" output) to + ;; be a parent path of the library path ("lib" output). + (string-append "PCLIBDIR=" "lib") + (string-append "PCINCDIR=" "include") ;; Skip auto-detection of, and creating a dependency on, the build ;; environment's ‘xz’ for what amounts to a dubious feature anyway. "HAVE_LZMA=0" diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 97f254ff6e..7f4662dc8b 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1383,14 +1383,14 @@ or junctions, and always follows hard links.") (define-public zstd (package (name "zstd") - (version "1.4.4") + (version "1.4.5") (source (origin (method url-fetch) (uri (string-append " https://github.com/facebook/zstd/releases/download/" "v" version "/zstd-" version ".tar.gz")) (sha256 - (base32 "05ckxap00qvc0j51d3ci38150cxsw82w7s9zgd5fgzspnzmp1vsr")))) + (base32 "17nf0r20360i80689bg5ipxbk2413b2dn3z7wj8byqpiddy1rscq")))) (build-system gnu-build-system) (outputs '("out" ;1.2MiB executables and