aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shvetsov <alexxy@gentoo.org>2009-10-15 15:41:35 +0400
committerAlexey Shvetsov <alexxy@gentoo.org>2009-10-15 15:41:35 +0400
commit77865e55b40af6e3fa556269783b3d0a68072bf1 (patch)
tree42652b9336f3e01d8ca531a1722baf2bcde471a9 /sys-infiniband
parentVersion bump to blcr-0.8.2. Minor edits to remove unused vmadump module (diff)
downloadsci-77865e55b40af6e3fa556269783b3d0a68072bf1.tar.gz
sci-77865e55b40af6e3fa556269783b3d0a68072bf1.tar.bz2
sci-77865e55b40af6e3fa556269783b3d0a68072bf1.zip
[sys-infiniband/ibutils] Fix bug 289037. thanks to Kacper Kowalik
(Portage version: 2.2_rc46/git/Linux x86_64) (Signed Manifest commit)
Diffstat (limited to 'sys-infiniband')
-rw-r--r--sys-infiniband/ibutils/ChangeLog4
-rw-r--r--sys-infiniband/ibutils/Manifest16
-rw-r--r--sys-infiniband/ibutils/files/ibutils-1.2-autotools.patch20
-rw-r--r--sys-infiniband/ibutils/files/ibutils-1.2-glib-2.10.patch22
-rw-r--r--sys-infiniband/ibutils/ibutils-1.2.ebuild5
5 files changed, 65 insertions, 2 deletions
diff --git a/sys-infiniband/ibutils/ChangeLog b/sys-infiniband/ibutils/ChangeLog
index 90680cefd..7cf4d57a6 100644
--- a/sys-infiniband/ibutils/ChangeLog
+++ b/sys-infiniband/ibutils/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 15 Oct 2009; Alexey Shvetsov <alexxy@gentoo.org> ibutils-1.2.ebuild,
+ +files/ibutils-1.2-autotools.patch, +files/ibutils-1.2-glib-2.10.patch:
+ Fix bug 289037. thanks to Kacper Kowalik
+
*ibutils-1.2 (20 Aug 2009)
20 Aug 2009; Alexey Shvetsov <alexxy@gentoo.org> +ibutils-1.2.ebuild,
diff --git a/sys-infiniband/ibutils/Manifest b/sys-infiniband/ibutils/Manifest
index f65fc3186..484b49169 100644
--- a/sys-infiniband/ibutils/Manifest
+++ b/sys-infiniband/ibutils/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ibutils-1.2-autotools.patch 901 RMD160 1cf38390927312d0af35fe129c9f0865cf30759a SHA1 29796d58b3ecdd43ff2fa0a6f60ced05bf44522d SHA256 4f205fb6d1fddf18a9ffea799eff581a031793f96a9c0028218d0ba704340d20
+AUX ibutils-1.2-glib-2.10.patch 943 RMD160 bb5b5fad0150eefc0cd6a2f9baeb8553a06e0da6 SHA1 275952370abe41c69a88c3a8b3d2f8614fbcf299 SHA256 a44c32f16fb389266e880eb296988948426138ab66d3b59d1acfada61a0cb1d4
DIST OFED-1.4.1.tgz 65180617 RMD160 748e669a1a5aef90dd9cec3e8fce110d0051a3cd SHA1 e558bb16c414e0f40727ac046cbd80a3fc84c87f SHA256 5e73c9ead49f286ef68d1618a042b5101887cf0f8c66fbfea5a8a7648feee1e6
-EBUILD ibutils-1.2.ebuild 482 RMD160 56d668ce9fcc1bbda9c8e53d2068f63f56fb221d SHA1 93ca7808628d1b4a1938e48437095b1fce80a075 SHA256 bb3c759956b5fb091790fdbedbe5a73f10b70d09b8be5c720789665e16f7a6fb
-MISC ChangeLog 256 RMD160 cdf67d43404c3adc9588fb39450178ba09e476a2 SHA1 e1006944fb9b7043df96c4d3bf2d88bca05206c2 SHA256 e9895349687dd8eebf294d3f4cd89651554a43517fa835d5003e9e50b7323365
+EBUILD ibutils-1.2.ebuild 573 RMD160 ee67ea17ea110cbfcc3854e2335af779b9f191d9 SHA1 09029fddb5c7bce4376fb70b5989b7e7ec39e3c6 SHA256 cfd67ab799e77779391618d074b3d7cbef8ca3f496ce25cba4d1d49a7c068b74
+MISC ChangeLog 445 RMD160 91212dbd18ef72f9b35cb7ceb40cdc69ec972cac SHA1 4ec322b462c16518976d89786ce9bcd48269e06d SHA256 27e759dd6c12f4e54f987d78c977ba189d207d51f9a8384774842b815cee3958
MISC metadata.xml 437 RMD160 af210ab36054cf26b2cc10e4b7c75a5eacdff0e6 SHA1 480d8a34be7258907194a0799d9f9069eac79ae7 SHA256 8f77909a6e8ca1abb060f99465a01456bc1d74b14ac2aabcae98faf66adffc7b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrXCm8ACgkQ5BmOA85PVLiinwCgqSDMJzrDw90ogzcLtmyA0W7F
+MuQAn1Nq9WASMt4Q/hMzDpSJ3hzKGyvX
+=v4YU
+-----END PGP SIGNATURE-----
diff --git a/sys-infiniband/ibutils/files/ibutils-1.2-autotools.patch b/sys-infiniband/ibutils/files/ibutils-1.2-autotools.patch
new file mode 100644
index 000000000..9b44b90aa
--- /dev/null
+++ b/sys-infiniband/ibutils/files/ibutils-1.2-autotools.patch
@@ -0,0 +1,20 @@
+--- ibutils-1.2.orig/ibdm/ibdm/Makefile.in 2009-05-27 17:26:57.000000000 +0200
++++ ibutils-1.2/ibdm/ibdm/Makefile.in 2009-10-14 17:18:24.950978547 +0200
+@@ -293,6 +293,7 @@
+ libibdm_la_LDFLAGS = -Wl,-rpath -Wl,$(TCL_PREFIX)/lib -version-info $(LIB_VER_TRIPLET) -no-undefined
+ ibdmsh_SOURCES = ibdmsh_wrap.cpp
+ ibdmsh_LDADD = -libdmcom $(TCL_LIBS)
++ibdmsh_DEPENDENCIES = libibdmcom.la
+ ibdmsh_LDFLAGS = -static -Wl,-rpath -Wl,$(TCL_PREFIX)/lib
+
+ # track latest GIT version for this tree:
+--- ibutils-1.2.orig/ibdm/ibdm/Makefile.am 2009-05-27 17:26:45.000000000 +0200
++++ ibutils-1.2/ibdm/ibdm/Makefile.am 2009-10-14 17:18:44.763825873 +0200
+@@ -87,6 +87,7 @@
+ bin_PROGRAMS = ibdmsh
+ ibdmsh_SOURCES = ibdmsh_wrap.cpp
+ ibdmsh_LDADD = -libdmcom $(TCL_LIBS)
++ibdmsh_DEPENDENCIES = libibdmcom.la
+ ibdmsh_LDFLAGS = -static -Wl,-rpath -Wl,$(TCL_PREFIX)/lib
+
+ $(srcdir)/Fabric.cpp: $(srcdir)/git_version.h
diff --git a/sys-infiniband/ibutils/files/ibutils-1.2-glib-2.10.patch b/sys-infiniband/ibutils/files/ibutils-1.2-glib-2.10.patch
new file mode 100644
index 000000000..57e4863d7
--- /dev/null
+++ b/sys-infiniband/ibutils/files/ibutils-1.2-glib-2.10.patch
@@ -0,0 +1,22 @@
+--- ibutils-1.2.orig/ibdm/ibdm/TopoMatch.cpp 2009-05-27 17:26:45.000000000 +0200
++++ ibutils-1.2/ibdm/ibdm/TopoMatch.cpp 2009-10-14 16:02:49.535651042 +0200
+@@ -676,7 +676,7 @@
+ IBSystem *p_system = p_node->p_system;
+
+ // we always mark the board of the node by examining all but the "UXXX"
+- char *p_lastSlash = rindex(p_node->name.c_str(), '/');
++ const char *p_lastSlash = rindex(p_node->name.c_str(), '/');
+ char nodeBoardName[512];
+ int boardNameLength;
+ if (!p_lastSlash) {
+--- ibutils-1.2.orig/ibdm/ibdm/SysDef.cpp 2009-05-27 17:26:45.000000000 +0200
++++ ibutils-1.2/ibdm/ibdm/SysDef.cpp 2009-10-14 16:03:12.178724234 +0200
+@@ -79,7 +79,7 @@
+
+ // the device number should be embedded in the master name of
+ // the node: MT23108 ...
+- char *p_digit;
++ const char *p_digit;
+ if ((p_digit = strpbrk(p_inst->master.c_str(), "0123456789")) != NULL)
+ sscanf(p_digit,"%u", &p_node->devId);
+
diff --git a/sys-infiniband/ibutils/ibutils-1.2.ebuild b/sys-infiniband/ibutils/ibutils-1.2.ebuild
index 97b4aa4a8..cc4746af7 100644
--- a/sys-infiniband/ibutils/ibutils-1.2.ebuild
+++ b/sys-infiniband/ibutils/ibutils-1.2.ebuild
@@ -18,6 +18,11 @@ DEPEND=">=sys-infiniband/libibverbs-1.1.2
RDEPEND="${DEPEND}
!sys-infiniband/openib-userspace"
+PATCHES=(
+ "${FILESDIR}/${P}-autotools.patch"
+ "${FILESDIR}/${P}-glib-2.10.patch"
+ )
+
src_install() {
make DESTDIR="${D}" install || die "install failed"
dodoc README AUTHORS ChangeLog