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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4EA7013835B for ; Thu, 7 Jan 2021 10:08:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D670E0878; Thu, 7 Jan 2021 10:08:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1D5D9E0878 for ; Thu, 7 Jan 2021 10:08:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 14E743412C0 for ; Thu, 7 Jan 2021 10:08:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A8E5748D for ; Thu, 7 Jan 2021 10:08:34 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1610014102.21c320c1a5455367d0df77c43005b26a8685cdff.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libiscsi/files/, net-libs/libiscsi/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libiscsi/files/libiscsi-1.18.0-fno-common.patch net-libs/libiscsi/libiscsi-1.18.0.ebuild X-VCS-Directories: net-libs/libiscsi/files/ net-libs/libiscsi/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 21c320c1a5455367d0df77c43005b26a8685cdff X-VCS-Branch: master Date: Thu, 7 Jan 2021 10:08:34 +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: 9e1f2d58-95de-450d-8405-8314ff4983db X-Archives-Hash: 144978addce1cc893532f4ba8f4b71c8 commit: 21c320c1a5455367d0df77c43005b26a8685cdff Author: Jakov Smolic sartura hr> AuthorDate: Thu Jan 7 10:08:22 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Thu Jan 7 10:08:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21c320c1 net-libs/libiscsi: Port to EAPI 7 * Disable static-libs * Fix build with gcc-10 Closes: https://bugs.gentoo.org/708526 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> .../files/libiscsi-1.18.0-fno-common.patch | 14 +++++++++++++ net-libs/libiscsi/libiscsi-1.18.0.ebuild | 23 ++++++++++++++-------- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common.patch b/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common.patch new file mode 100644 index 00000000000..e5ce2f7bd49 --- /dev/null +++ b/net-libs/libiscsi/files/libiscsi-1.18.0-fno-common.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/708526 +Taken from: https://github.com/sahlberg/libiscsi/pull/307 +Author: wanghonghao +--- a/include/iser-private.h ++++ b/include/iser-private.h +@@ -159,7 +159,7 @@ struct iser_tx_desc { + struct iser_cm_hdr { + uint8_t flags; + uint8_t rsvd[3]; +-} __packed; ++}; + + struct iser_pdu { + struct iscsi_pdu iscsi_pdu; diff --git a/net-libs/libiscsi/libiscsi-1.18.0.ebuild b/net-libs/libiscsi/libiscsi-1.18.0.ebuild index 652b0b2953a..d5f2c942c2d 100644 --- a/net-libs/libiscsi/libiscsi-1.18.0.ebuild +++ b/net-libs/libiscsi/libiscsi-1.18.0.ebuild @@ -1,22 +1,29 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86" +fi + DESCRIPTION="iscsi client library and utilities" HOMEPAGE="https://github.com/sahlberg/libiscsi" -SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" SLOT="0" LICENSE="GPL-2 LGPL-2" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86" -IUSE="static-libs" RDEPEND="dev-libs/libgcrypt:0=" DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) + src_prepare() { default eautoreconf @@ -25,11 +32,11 @@ src_prepare() { src_configure() { econf \ --enable-manpages \ - --disable-werror \ - $(use_enable static-libs static) + --disable-static \ + --disable-werror } src_install() { default - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die }