gentoo resync : 22.05.2021

3 files changed, 38 insertions, 6 deletions

diff --git a/sys-fabric/ibacm/Manifest b/sys-fabric/ibacm/Manifest
index 1d68f3905353..118c605395cb 100644
--- a/sys-fabric/ibacm/Manifest
+++ b/sys-fabric/ibacm/Manifest
@@ -1,3 +1,4 @@
+AUX ibacm-1.0.8-fix-pthread-linkage.patch 718 BLAKE2B 39609a6f63f76959eacb27d8dd611ca1d20714ea6e2bc862d90162b432da8a7ab1551cd8c7917ce498fb8cfaa1b6a889c115616367aec21b80f8d68788f6fb6e SHA512 8bad15c765ada19ee020f7ae808b1300c7033834a0c9faa02081d00f27a95cacc48f9b5650ca6e8cc22b0ad0a4059666b6fd103a12bd7dbfb5e5386f35a8f0ba
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD ibacm-1.0.8.ebuild 413 BLAKE2B f31121dd3467ec5e9daf5222519ec02f82cb6f54222a5e832b77d6ea502e7b3625647dcbf4274bea9dfc99b9940570f32917265f96caa5521e8889a3099b8c33 SHA512 c4d711f56a53a3f95afbb38fe5c84cf1ce7d08cade000a2bc69e821064770964a6942ef46ad4cf0061648ff15203ead4dfbdd84c00b35f66ddcaebf1c9a4a174
+EBUILD ibacm-1.0.8.ebuild 553 BLAKE2B 7f839fd6dfb6ba37f2742e2dd231a05ddcba884c68762d5c3de0c992ea369d8871b995a0ab85f7f421f579e5049d691f38fe8f6f9554ecb94f4e073f19f1c67e SHA512 9cbe9bb5c6069f23d83c9e505e017db26ed5c0a0a2e9ddda207fe78632f50868697d1c8bbb1149db5581e5fa7012f7d43665bdae6b9c7ac3ad1b350fdad305bb
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/sys-fabric/ibacm/files/ibacm-1.0.8-fix-pthread-linkage.patch b/sys-fabric/ibacm/files/ibacm-1.0.8-fix-pthread-linkage.patch
new file mode 100644
index 000000000000..8a9e5b5f03e6
--- /dev/null
+++ b/sys-fabric/ibacm/files/ibacm-1.0.8-fix-pthread-linkage.patch
@@ -0,0 +1,20 @@
+https://github.com/ofiwg/ibacm/commit/7a781f6d554532995181b9efbe445599b25c271a.patch
+https://bugs.gentoo.org/611778
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,12 +1,13 @@
+ AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/linux
+ 
+ AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DRDMADIR=\"@rdmadir@\"
+-
++AM_LDFLAGS = -lpthread -ldl
+ bin_PROGRAMS = util/ib_acme
+ sbin_PROGRAMS = svc/ibacm
+ svc_ibacm_SOURCES = src/acm.c
+ util_ib_acme_SOURCES = src/acme.c linux/acme_linux.c src/libacm.c linux/libacm_linux.c src/parse.c
+ svc_ibacm_CFLAGS = $(AM_CFLAGS)
++svc_ibacm_LDFLAGS = -rdynamic $(AM_LDFLAGS)
+ util_ib_acme_CFLAGS = $(AM_CFLAGS)
+ 
+ ibacmincludedir = $(includedir)/infiniband
diff --git a/sys-fabric/ibacm/ibacm-1.0.8.ebuild b/sys-fabric/ibacm/ibacm-1.0.8.ebuild
index 2872d490e173..2239f9c1e8e7 100644
--- a/sys-fabric/ibacm/ibacm-1.0.8.ebuild
+++ b/sys-fabric/ibacm/ibacm-1.0.8.ebuild
@@ -1,22 +1,33 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 OFED_VER="3.12"
 OFED_RC="1"
 OFED_RC_VER="1"
 OFED_SUFFIX="1"
 
-inherit openib
+inherit autotools openib
 
 DESCRIPTION="IB CM pre-connection service application"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
-IUSE=""
+KEYWORDS="amd64 x86 ~amd64-linux"
 
 RDEPEND="
 	sys-fabric/libibumad:${SLOT}
 	sys-fabric/libibverbs:${SLOT}
 "
 DEPEND="${RDEPEND}"
+
 block_other_ofed_versions
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-pthread-linkage.patch
+)
+
+src_prepare() {
+	default
+
+	# Needed for pthread fix (bug #611778)
+	eautoreconf
+}