[openfabrics-ewg] [PATCH OFED-1.1-rc7] openib.spec: solve rpm packaging issue with 64/32 bit binaries and libraries on ppc64

[Hoang-Nam Nguyen]

Hi Michael!
Sorry, I pressed the send button too quick. Please ignore the previous patch.
Here is the new patch that solves two problems:
* Make sure that _libdir and _libdir32 don't point to the same directory
on ppc64. On SLES9 I observed on several systems that _libdir points to
lib instead lib64 as expected by openib.spec. This prevents 64-bit libraries
being overwritten by 32-bit libraries.
* Include also libehca.so in libehca rpm, because libibverbs searches for
lib files ending with .so. Currently you need to install libehca-devel
in order to get libehca.so. I saw this problem after I took a clean system
for testing...
I apologize for this late message as I've had other tasks to complete today
and would be glad to see this patch in OFED-1.1.
Thanks!
Nam


Signed-off-by: Hoang-Nam Nguyen <hnguyen at de.ibm.com>
---


 openib.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)


diff -Nurp openib-1.1/openib.spec openib-1.1_patch/openib.spec
--- openib-1.1/openib.spec 2006-10-05 15:11:33.000000000 +0200
+++ openib-1.1_patch/openib.spec 2006-10-18 17:25:01.000000000 +0200
@@ -41,6 +41,12 @@
 %{!?build_32bit: %define build_32bit 0}
 %{!?_libdir32: %define _libdir32 %{_prefix}/lib}
 
+# assure those dirs don't point to the same location
+%ifarch ppc64
+%define _libdir %{_prefix}/lib64
+%define _libdir32 %{_prefix}/lib
+%endif
+
 # %{!?MEMTRACK: %define MEMTRACK 0}
 %define MEMTRACK %(if ( echo %{configure_options} | grep "with-memtrack" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
 %define MADEYE %(if ( echo %{configure_options} | grep "with-madeye-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
@@ -1638,7 +1644,7 @@ fi
 %if %{build_libehca}
 %files -n libehca -f libehca-files
 %defattr(-,root,root,-)
-%{_libdir}/infiniband/libehca*.so.*
+%{_libdir}/infiniband/libehca*.so*
 # %doc AUTHORS COPYING ChangeLog README
 %endif
 
-------------- next part --------------
diff -Nurp openib-1.1/openib.spec openib-1.1_patch/openib.spec
--- openib-1.1/openib.spec	2006-10-05 15:11:33.000000000 +0200
+++ openib-1.1_patch/openib.spec	2006-10-18 17:25:01.000000000 +0200
@@ -41,6 +41,12 @@
 %{!?build_32bit: %define build_32bit 0}
 %{!?_libdir32: %define _libdir32 %{_prefix}/lib}
 
+# assure those dirs don't point to the same location
+%ifarch ppc64
+%define _libdir %{_prefix}/lib64
+%define _libdir32 %{_prefix}/lib
+%endif
+
 # %{!?MEMTRACK: %define MEMTRACK 0}
 %define MEMTRACK %(if ( echo %{configure_options} | grep "with-memtrack" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
 %define MADEYE %(if ( echo %{configure_options} | grep "with-madeye-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
@@ -1638,7 +1644,7 @@ fi
 %if %{build_libehca}
 %files -n libehca -f libehca-files
 %defattr(-,root,root,-)
-%{_libdir}/infiniband/libehca*.so.*
+%{_libdir}/infiniband/libehca*.so*
 # %doc AUTHORS COPYING ChangeLog README
 %endif