From patchwork Thu Sep 7 15:20:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Dion X-Patchwork-Id: 53630 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 D013027BBE9; Thu, 7 Sep 2023 16:22:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 4D4A927BBE2 for ; Thu, 7 Sep 2023 16:22:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qeGpZ-0001mZ-PZ; Thu, 07 Sep 2023 11:22:05 -0400 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 1qeGpV-0001hO-5Q for guix-patches@gnu.org; Thu, 07 Sep 2023 11:22:02 -0400 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 1qeGpU-0001OU-JE for guix-patches@gnu.org; Thu, 07 Sep 2023 11:22:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qeGpW-0002IL-8h for guix-patches@gnu.org; Thu, 07 Sep 2023 11:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65624] [PATCH v2 1/2] gnu: multipath-tools: Update to 0.9.6. Resent-From: odion@efficios.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Sep 2023 15:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65624 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: Maxim Cournoyer , Olivier Dion Cc: Olivier Dion , 65624@debbugs.gnu.org Received: via spool by 65624-submit@debbugs.gnu.org id=B65624.16941000738744 (code B ref 65624); Thu, 07 Sep 2023 15:22:02 +0000 Received: (at 65624) by debbugs.gnu.org; 7 Sep 2023 15:21:13 +0000 Received: from localhost ([127.0.0.1]:41014 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeGoi-0002Gx-Vy for submit@debbugs.gnu.org; Thu, 07 Sep 2023 11:21:13 -0400 Received: from [2607:5300:203:b2ee::31e5] (port=34332 helo=smtpout.efficios.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeGoc-0002FU-1E for 65624@debbugs.gnu.org; Thu, 07 Sep 2023 11:21:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=efficios.com; s=smtpout1; t=1694100057; bh=XTDztt6qAqbg81/mM4BCIQMOyNGFjEMOSaVc5x8qXe8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B4fv3r/I0CklSOV6pewiiT0mMMMjsnOQ462eviv10+wHKrn13pWarClgl3JUkgMyE sRsN1lfn6qgkQCy6br9eg6DgmWMJJxFG/v1RwbPnq4kmTy9n+29x9ItKF2rHIiDbQ2 xil3DKgifoZZmM8o4iAdoYuk5sFckZ56fHz9XeTTIM36ApsT4D5fZaBor6ts25lWfB 7j+aYFb+1HEVyT/HyWleqTEUJ2+tzibZnidP++mMdbf4VqgxVnoK68CnhRq9OMH2ec kDSfwqkl/6lE0CvcUER5Hp9CrNp5rRONpqo/6lZ9XMyhxojoOqZF5jERMDK1nPmaFr EL1L4PrbrSi/w== Received: from laura.hitronhub.home (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) by smtpout.efficios.com (Postfix) with ESMTPSA id 4RhNHF2T8Tz1NrC; Thu, 7 Sep 2023 11:20:57 -0400 (EDT) From: odion@efficios.com Date: Thu, 7 Sep 2023 11:20:52 -0400 Message-ID: <20230907152053.12402-1-odion@efficios.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <87a5tz5ioo.fsf@gmail.com> References: <87a5tz5ioo.fsf@gmail.com> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Olivier Dion * gnu/packages/linux.scm (multipath-tools): Update to 0.9.6. [#:make-flags]: Set systemd_prefix to output and remove SYSTEMDPATH. [#:phases]: Add phase 'no-fortfify-3 before 'build. [inputs]: Add util-linux "lib" output for libmount. --- gnu/packages/linux.scm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 36354b4d82..3d310941a4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5547,7 +5547,7 @@ (define-public mdadm-static (define-public multipath-tools (package (name "multipath-tools") - (version "0.9.3") + (version "0.9.6") (home-page "https://github.com/opensvc/multipath-tools") (source (origin (method git-fetch) @@ -5555,7 +5555,7 @@ (define-public multipath-tools (file-name (git-file-name name version)) (sha256 (base32 - "0zcnr1135znizbnfqhqv3by9i2qwn5vg6kgmj6ma3yy1x1krx0d4")) + "1933iqh9r54pdl95yck0n4bw7jiiblymc964vlc1787qd4q012sz")) (modules '((guix build utils))) (snippet '(begin @@ -5573,7 +5573,7 @@ (define-public multipath-tools (string-append "prefix=" #$output) ;; Install Udev rules below this directory, relative ;; to the prefix. - "SYSTEMDPATH=lib") + (string-append "systemd_prefix=" #$output)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-source @@ -5605,6 +5605,16 @@ (define-public multipath-tools (("CFLAGS \\+= " match) (string-append match "-Wno-error=unused-function "))))) (delete 'configure) ;no configure script + (add-before 'build 'no-fortify-3 + (lambda _ + ;; NOTE: The check made seems to wrongly assume the + ;; FORTIFY_SOURCE=3 is valid. However, when compiling, warnings + ;; are emitted from glibc, resulting in failed build. Fix this + ;; by forcing the usage of FORTIFY_SOURCE=2. + (substitute* "create-config.mk" + (("FORTIFY_SOURCE=3") + "FORTIFY_SOURCE=2")) + )) (add-before 'build 'set-LDFLAGS (lambda _ ;; Note: this cannot be passed as a make flag because that will @@ -5622,7 +5632,9 @@ (define-public multipath-tools liburcu lvm2 readline - eudev)) + eudev + ;; For libmount. + `(,util-linux "lib"))) (synopsis "Access block devices through multiple paths") (description "This package provides the following binaries to drive the