From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Wed, 20 Apr 2011 18:33:58 +0000 (+0000)
Subject: - one more fix in link patch
X-Git-Tag: auto/th/opensm-3_3_9-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=f5539f425c05489615b125d71026428ecd8ee57c;p=packages%2Fopensm.git

- one more fix in link patch
- added skip_post_check_so workaround

Changed files:
    opensm-link.patch -> 1.2
    opensm.spec -> 1.4
---

diff --git a/opensm-link.patch b/opensm-link.patch
index 7b49cb0..8a84822 100644
--- a/opensm-link.patch
+++ b/opensm-link.patch
@@ -9,3 +9,13 @@
  libosmvendor_la_LDFLAGS = -version-info $(osmvendor_api_version) \
  	-export-dynamic $(libosmvendor_version_script)
  libosmvendor_la_DEPENDENCIES = $(srcdir)/libosmvendor.map
+--- opensm-3.3.9/opensm/Makefile.am.orig	2011-03-07 08:54:55.000000000 +0100
++++ opensm-3.3.9/opensm/Makefile.am	2011-04-20 20:23:55.123277689 +0200
+@@ -22,6 +22,7 @@
+ libopensm_la_SOURCES = osm_log.c osm_mad_pool.c osm_helper.c
+ libopensm_la_LDFLAGS = -version-info $(opensm_api_version) \
+ 	-export-dynamic $(libopensm_version_script)
++libopensm_la_LIBADD = $(top_builddir)/complib/libosmcomp.la
+ libopensm_la_DEPENDENCIES = $(srcdir)/libopensm.map
+ 
+ sbin_PROGRAMS = opensm
diff --git a/opensm.spec b/opensm.spec
index 3a636c6..b024747 100644
--- a/opensm.spec
+++ b/opensm.spec
@@ -18,6 +18,9 @@ BuildRequires:	libtool
 Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# these libs refer to symbols in each other
+%define		skip_post_check_so	libopensm\.so.* libosmvendor\.so.*
+
 %description
 libibmad provides low layer InfiniBand functions for use by the IB
 diagnostic and management programs. These include MAD, SA, SMP, and