From patchwork Sun Nov 5 15:21:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 55953 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 7103127BBE2; Sun, 5 Nov 2023 15:22:36 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 42D3D27BBE9 for ; Sun, 5 Nov 2023 15:22:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qzexH-00027A-Ma; Sun, 05 Nov 2023 10:22:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qzexF-00026y-Mz for guix-patches@gnu.org; Sun, 05 Nov 2023 10:22:25 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qzexF-0002Ru-Ef for guix-patches@gnu.org; Sun, 05 Nov 2023 10:22:25 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qzexp-0006Na-Uk for guix-patches@gnu.org; Sun, 05 Nov 2023 10:23:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66952] [PATCH] gnu: libarchive: Replace add--L-in-libarchive-pc by configure-flags. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Nov 2023 15:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66952 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66952@debbugs.gnu.org Cc: ngraves@ngraves.fr X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169919775124481 (code B ref -1); Sun, 05 Nov 2023 15:23:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Nov 2023 15:22:31 +0000 Received: from localhost ([127.0.0.1]:38014 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzexK-0006Mn-Fx for submit@debbugs.gnu.org; Sun, 05 Nov 2023 10:22:30 -0500 Received: from lists.gnu.org ([2001:470:142::17]:45432) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzexI-0006MW-4N for submit@debbugs.gnu.org; Sun, 05 Nov 2023 10:22:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qzewb-00023R-3o for guix-patches@gnu.org; Sun, 05 Nov 2023 10:21:45 -0500 Received: from 3.mo581.mail-out.ovh.net ([46.105.34.113]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qzewZ-0002Ob-5O for guix-patches@gnu.org; Sun, 05 Nov 2023 10:21:44 -0500 Received: from director6.ghost.mail-out.ovh.net (unknown [10.108.16.216]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 79ABB26927 for ; Sun, 5 Nov 2023 15:21:32 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-6mdn5 (unknown [10.110.171.46]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 2EBA21FDFF; Sun, 5 Nov 2023 15:21:32 +0000 (UTC) Received: from ngraves.fr ([37.59.142.107]) by ghost-submission-6684bf9d7b-6mdn5 with ESMTPSA id wYHTB/yyR2V2eQIAZz2lBg (envelope-from ); Sun, 05 Nov 2023 15:21:32 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-107S0016740a0d0-5a1e-463f-890a-7b54eaf027c3, 6F962DE53BA82483BC68290647705E86A13CDC71) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Sun, 5 Nov 2023 16:21:25 +0100 Message-ID: <20231105152129.26938-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 12897183433603408610 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrudduvddgjeehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffogggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekueekjeetleetgfduvddvvdegkeduheeivddvhffgheefveekgffhgeefleffteenucffohhmrghinhepghhnuhdrohhrghdplhhisggrrhgthhhivhgvrdhorhhgnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrddutdejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht Received-SPF: pass client-ip=46.105.34.113; envelope-from=ngraves@ngraves.fr; helo=3.mo581.mail-out.ovh.net 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/backup.scm (libarchive): Replace add--L-in-libarchive-pc by configure-flags. [arguments](phases): Remove phase add--L-in-libarchive-pc. (configuration-flags): Adapt configuration LIBS to avoid propagation. Change-Id: I85f623043e98b82e46b9afe18c0be53cc7961d4b --- gnu/packages/backup.scm | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 12c4a45b9d..b5e4112c4b 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Feng Shu ;;; Copyright © 2023 Timo Wilken +;;; Copyright © 2023 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,7 +42,6 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages backup) - #:use-module (guix gexp) #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix gexp) @@ -262,7 +262,15 @@ (define-public libarchive `(,zstd "lib"))) (arguments (list - #:configure-flags #~'("--disable-static") + ;; Embed absolute references to inputs to avoid propagation. + #:configure-flags + #~(list "--disable-static" + (string-append + "LIBS= -L" + (string-join + (list #$@(map (lambda (in) (this-package-input (car in))) + (package-inputs this-package))) + "/lib -L"))) #:phases #~(modify-phases %standard-phases (add-before 'build 'patch-pwd @@ -288,32 +296,7 @@ (define-public libarchive (invoke "./bsdcpio_test" "^test_owner_parse") (invoke "./bsdtar_test")) ;; Tests may be disabled if cross-compiling. - (format #t "Test suite not run.~%")))) - (add-after 'install 'add--L-in-libarchive-pc - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out #$output) - (lib (string-append out "/lib")) - (nettle (assoc-ref inputs "nettle")) - (libxml2 (assoc-ref inputs "libxml2")) - (xz (assoc-ref inputs "xz")) - (zlib (assoc-ref inputs "zlib")) - (zstd (assoc-ref inputs "zstd")) - (bzip2 (assoc-ref inputs "bzip2"))) - ;; Embed absolute references to these inputs to avoid propagation. - (substitute* (list (string-append lib "/pkgconfig/libarchive.pc") - (string-append lib "/libarchive.la")) - (("-lnettle") - (string-append "-L" nettle "/lib -lnettle")) - (("-lxml2") - (string-append "-L" libxml2 "/lib -lxml2")) - (("-llzma") - (string-append "-L" xz "/lib -llzma")) - (("-lz") - (string-append "-L" zlib "/lib -lz")) - (("-lzstd") - (string-append "-L" zstd "/lib -lzstd")) - (("-lbz2") - (string-append "-L" bzip2 "/lib -lbz2"))))))))) + (format #t "Test suite not run.~%"))))))) (home-page "https://libarchive.org/") (synopsis "Multi-format archive and compression library") (description