From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 13E5B158020 for ; Sun, 30 Oct 2022 21:32:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 17338E07C7; Sun, 30 Oct 2022 21:32:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ED114E07C7 for ; Sun, 30 Oct 2022 21:32:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B3748340EA4 for ; Sun, 30 Oct 2022 21:32:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC7FC5E7 for ; Sun, 30 Oct 2022 21:32:15 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1667165524.4700792d0f60249c0079b19bbf324906a89f43ec.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild X-VCS-Directories: sys-fs/multipath-tools/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4700792d0f60249c0079b19bbf324906a89f43ec X-VCS-Branch: master Date: Sun, 30 Oct 2022 21:32:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: aa08ec8a-ee07-43d6-8ada-ac537f2a18ac X-Archives-Hash: c9cf64d3db1e14c2e1528d82158f3006 commit: 4700792d0f60249c0079b19bbf324906a89f43ec Author: Sam James gentoo org> AuthorDate: Sun Oct 30 21:31:49 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Oct 30 21:32:04 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4700792d sys-fs/multipath-tools: add note for Makefile hack It should be fixed upstream in 0.9.3. Signed-off-by: Sam James gentoo.org> sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild index 74c4e010e73a..9edc596d1197 100644 --- a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild +++ b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild @@ -29,11 +29,9 @@ BDEPEND="virtual/pkgconfig" CONFIG_CHECK="~DM_MULTIPATH" -PATCHES=( ) - src_prepare() { default - # life is too short for some trivial patches + sed -r -i -e '/^(CPPFLAGS|CFLAGS)\>/s,^(CPPFLAGS|CFLAGS)\>[[:space:]]+:=,\1 := $(GENTOO_\1),' \ "${S}"/Makefile.inc || die } @@ -55,7 +53,9 @@ src_compile() { src_install() { dodir /sbin - # upstream makefile has terrible $(prefix) choices + + # Please clean this up > 0.9.3: https://github.com/opensvc/multipath-tools/pull/53 + # $(prefix) doesn't work correctly in makefile in 0.9.3. emake \ DESTDIR="${ED}" \ prefix="${EPREFIX}" \ @@ -67,6 +67,7 @@ src_install() { GENTOO_CFLAGS="${CFLAGS}" \ GENTOO_CPPFLAGS="${CPPFLAGS}" \ install + rmdir "${ED}"/usr/include rmdir "${ED}"/usr/share mv "${ED}"/include "${ED}"/usr/include || die