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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2D0B2158086 for ; Tue, 14 Dec 2021 19:40:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1EF0E2BC007; Tue, 14 Dec 2021 19:40:33 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 D00532BC007 for ; Tue, 14 Dec 2021 19:40:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 D1AEA342F8E for ; Tue, 14 Dec 2021 19:40:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 50516132 for ; Tue, 14 Dec 2021 19:40:28 +0000 (UTC) From: "John Helmert III" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "John Helmert III" Message-ID: <1639510813.cc263284ef21c967e53f1245482533c0353fd0b3.ajak@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.19.0-fix-rdma-automagic.patch net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild net-libs/libiscsi/metadata.xml X-VCS-Directories: net-libs/libiscsi/files/ net-libs/libiscsi/ X-VCS-Committer: ajak X-VCS-Committer-Name: John Helmert III X-VCS-Revision: cc263284ef21c967e53f1245482533c0353fd0b3 X-VCS-Branch: master Date: Tue, 14 Dec 2021 19:40:28 +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: 7e796aac-b22e-4467-bebe-5f434ec16366 X-Archives-Hash: 73aa60ba09321adabc30d91f5fafe06a commit: cc263284ef21c967e53f1245482533c0353fd0b3 Author: John Helmert III gentoo org> AuthorDate: Tue Dec 14 19:38:09 2021 +0000 Commit: John Helmert III gentoo org> CommitDate: Tue Dec 14 19:40:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc263284 net-libs/libiscsi: update EAPI 7 -> 8, fix rdma automagic Closes: https://bugs.gentoo.org/829185 Signed-off-by: John Helmert III gentoo.org> .../files/libiscsi-1.19.0-fix-rdma-automagic.patch | 26 +++++++++++ net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild | 51 ++++++++++++++++++++++ net-libs/libiscsi/metadata.xml | 3 ++ 3 files changed, 80 insertions(+) diff --git a/net-libs/libiscsi/files/libiscsi-1.19.0-fix-rdma-automagic.patch b/net-libs/libiscsi/files/libiscsi-1.19.0-fix-rdma-automagic.patch new file mode 100644 index 000000000000..987544ffca68 --- /dev/null +++ b/net-libs/libiscsi/files/libiscsi-1.19.0-fix-rdma-automagic.patch @@ -0,0 +1,26 @@ +diff --git a/configure.ac b/configure.ac +index 5fe1deb..9efe153 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -140,6 +140,8 @@ if test x"$libiscsi_cv_HAVE_SG_IO" = x"yes"; then + AC_DEFINE(HAVE_SG_IO,1,[Whether we have SG_IO support]) + fi + ++AC_ARG_WITH([rdma], AS_HELP_STRING([--with-rdma], [Build with rdma support])) ++ + AC_CACHE_CHECK([for iSER support],libiscsi_cv_HAVE_LINUX_ISER,[ + AC_TRY_COMPILE([ + #include +@@ -147,10 +149,10 @@ AC_TRY_COMPILE([ + #include ], + [int ibv = IBV_WC_SEND;], + libiscsi_cv_HAVE_LINUX_ISER=yes,libiscsi_cv_HAVE_LINUX_ISER=no)]) +-if test x"$libiscsi_cv_HAVE_LINUX_ISER" = x"yes"; then ++if test x"$libiscsi_cv_HAVE_LINUX_ISER" = x"yes" && test "x$with_rdma" = "xyes"; then + AC_DEFINE(HAVE_LINUX_ISER,1,[Whether we have iSER support]) + fi +-AM_CONDITIONAL([HAVE_LINUX_ISER], [test $libiscsi_cv_HAVE_LINUX_ISER = yes]) ++AM_CONDITIONAL([HAVE_LINUX_ISER], [test "x$with_rdma" = "xyes"]) + + AC_CACHE_CHECK([whether libcunit is available], + [ac_cv_have_cunit], diff --git a/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild b/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild new file mode 100644 index 000000000000..b44971289d2f --- /dev/null +++ b/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" + SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-remove-ld-iscsi.patch.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +fi + +DESCRIPTION="iscsi client library and utilities" +HOMEPAGE="https://github.com/sahlberg/libiscsi" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +IUSE="rdma" + +RDEPEND="dev-libs/libgcrypt:0= + rdma? ( sys-cluster/rdma-core )" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.18.0-fno-common.patch + "${FILESDIR}"/${PN}-1.18.0-fno-common-2.patch + "${FILESDIR}"/${PN}-1.18.0-fno-common-3.patch + "${FILESDIR}"/${PN}-1.19.0-fix-rdma-automagic.patch + "${WORKDIR}"/${P}-remove-ld-iscsi.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --enable-manpages \ + $(use_with rdma) \ + --disable-werror +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-libs/libiscsi/metadata.xml b/net-libs/libiscsi/metadata.xml index fae5428e41b5..afb733ae6305 100644 --- a/net-libs/libiscsi/metadata.xml +++ b/net-libs/libiscsi/metadata.xml @@ -5,4 +5,7 @@ sahlberg/libiscsi + + Enable infiniband support via sys-fabric/librdmacm +