Add various infiniband utilities

2020-06-27 16:25:57 -04:00
parent 6c9c3c01a7
commit 8ea81d1fc0
7 changed files with 291 additions and 0 deletions
@@ -0,0 +1,42 @@
+# Maintainer: James P. Harvey <jamespharvey20 at gmail dot com>
+
+pkgname=ibutils
+pkgver=1.5.7
+_pkgver_subver=0.2
+_pkgver_commit=gbd7e502
+pkgrel=2
+pkgdesc='OpenFabrics Alliance InfiniBand network diagnostic and testing utilities'
+arch=('x86_64' 'i686')
+url='https://www.openfabrics.org/index.php/overview.html'
+license=('GPL2' 'custom:"OpenIB.org BSD"')
+depends=('opensm' 'tk' 'perl')
+source=("https://www.openfabrics.org/downloads/${pkgname}/${pkgname}-${pkgver}-${_pkgver_subver}.${_pkgver_commit}.tar.gz"
+        'ibis-drop-multiple-definition-of-IbisObj.patch')
+sha256sums=('67a3b417c8d0820400045dd7143674824086c6793a40ded333be50e498d9a703'
+            '4fafa1e2e26e79ba5c826263f691380839b28631eb1ed4fe3a4700167bec4d92')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 < "${srcdir}/ibis-drop-multiple-definition-of-IbisObj.patch"
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+              --sbindir=/usr/bin \
+              --libexecdir=/usr/lib \
+              --sysconfdir=/etc \
+              --localstatedir=/var \
+              --mandir=/usr/share/man \
+              --with-tk-lib=/usr/lib/libtk8.6
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+
+  # No reason this should be going into /usr/bin
+  rm -f "${pkgdir}/usr/bin/git_version.tcl"
+}
@@ -0,0 +1,46 @@
+commit 62998956cb17538f925f76ce6c4193f415f7cc01
+Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
+Date:   Sun Jun 7 14:56:55 2020 +0200
+
+    ibis drop multiple definition of IbisObj
+    
+    Drop multiple global definition of IbisObj that breaks with GCC10
+    
+    Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
+
+diff --git ibis/src/ibis.i ibis/src/ibis.i
+index 28a0912dd848..e66d84e7bb80 100644
+--- a/ibis/src/ibis.i
+++ b/ibis/src/ibis.i
+@@ -180,7 +180,6 @@ ibisp_is_debug(void)
+ 
+ %{
+   /* globals */
+-  ibis_t    IbisObj;
+   static ibis_opt_t  *ibis_opt_p;
+   ibis_opt_t IbisOpts;
+ 
+diff --git ibis/src/ibis_wrap.c ibis/src/ibis_wrap.c
+index ee9760127577..7efadea896ab 100644
+--- a/ibis/src/ibis_wrap.c
+++ b/ibis/src/ibis_wrap.c
+@@ -3004,7 +3004,6 @@ typedef struct {
+ 
+ 
+   /* globals */
+-  ibis_t    IbisObj;
+   static ibis_opt_t  *ibis_opt_p;
+   ibis_opt_t IbisOpts;
+ 
+diff --git ibis/src/ibissh_wrap.cpp ibis/src/ibissh_wrap.cpp
+index 917904fe382a..2f69c4018e71 100644
+--- a/ibis/src/ibissh_wrap.cpp
+++ b/ibis/src/ibissh_wrap.cpp
+@@ -3004,7 +3004,6 @@ typedef struct {
+ 
+ 
+   /* globals */
+-  ibis_t    IbisObj;
+   static ibis_opt_t  *ibis_opt_p;
+   ibis_opt_t IbisOpts;
+