[openib-general] [PATCH] ~vlad/ofascripts.git - Add libcxgb3 to user kit

[Steve Wise]

Vlad,  

Here are the changes to ofa userspace scripts for adding Chelsio's RDMA library, libcxgb3. 

Steve.


-----

Support for libcxgb3.

From: Steve Wise <swise at opengridcomputing.com>

- added libcxgb3 to configure
- added libcxgb3 to Makefile

Signed-off-by: Steve Wise <swise at opengridcomputing.com>
---

 Makefile  |   17 ++++++++++++++++-
 configure |   16 ++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index b164ee0..4d57d82 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,8 @@ all:
 .PHONY: libibverbs libmthca libibcm perftest mstflint libsdp libibcommon libibumad libibmad osm diags mpi
 .PHONY: librdmacm install_librdmacm dapl dat tvflash install_tvflash
 .PHONY: install_libibverbs install_libmthca install_libibcm install_libsdp libibcommon
-.PHONY: libipathverbs install_libipathverbs libehca install_libehca
+.PHONY: libipathverbs install_libipathverbs libehca install_libehca 
+.PHONY: libcxgb3 install_libcxgb3
 .PHONY: install_libibumad install_libibmad install_osm install_diags install_mstflint install_perftest
 .PHONY: srptools install_srptools ipoibtools install_ipoibtools
 	
@@ -49,6 +50,11 @@ user:	libehca
 install_user:	install_libehca
 endif
 
+ifeq ($(WITH_CXGB3),yes)
+user:	libcxgb3
+install_user:	install_libcxgb3
+endif
+
 ifeq ($(WITH_CM),yes)
 user:	libibcm
 install_user:	install_libibcm
@@ -139,6 +145,11 @@ libehca: libibverbs
 	AM_LDFLAGS="-L../libibverbs/src -libverbs"
 	@echo "Make libehca done"
 
+libcxgb3: libibverbs
+	$(MAKE) -C $(SRC)userspace/libcxgb3 \
+	AM_LDFLAGS="-L../libibverbs/src -libverbs"
+	@echo "Make libcxgb3 done"
+
 libibcm: libibverbs
 	$(MAKE) -C $(SRC)userspace/libibcm \
 	CPPFLAGS="-I../libibverbs/include" \
@@ -281,6 +292,9 @@ install_libipathverbs:	install_libibverb
 install_libehca:	install_libibverbs
 	$(MAKE) -C $(SRC)userspace/libehca install
 	
+install_libcxgb3:	install_libibverbs
+	$(MAKE) -C $(SRC)userspace/libcxgb3 install
+	
 install_libibcm:	install_libmthca
 	$(MAKE) -C $(SRC)userspace/libibcm install
 	
@@ -385,6 +399,7 @@ clean_user:
 	$(MAKE) -C $(SRC)userspace/libmthca clean
 	$(MAKE) -C $(SRC)userspace/libipathverbs clean
 	$(MAKE) -C $(SRC)userspace/libehca clean
+	$(MAKE) -C $(SRC)userspace/libcxgb3 clean
 	$(MAKE) -C $(SRC)userspace/libibcm clean
 	# $(MAKE) -C $(SRC)userspace/useraccess-lib clean
 	$(MAKE) -C $(SRC)userspace/perftest clean
diff --git a/configure b/configure
index 5f8253e..616ef5c 100755
--- a/configure
+++ b/configure
@@ -58,6 +58,9 @@ Usage:  `basename $0` [options]
     --with-libehca include libehca package [yes]
     --without-libehca include libehca package [no]
     
+    --with-libcxgb3 include libcxgb3 package [yes]
+    --without-libcxgb3 include libcxgb3 package [no]
+
     --with-libibcm  include CM package [no]
     --without-libibcm  don't include CM package [yes]
     
@@ -277,6 +280,13 @@ main()
                         --without-libehca)
                                 WITH_EHCA="no"
                         ;;
+                        --with-libcxgb3)
+                                WITH_CXGB3="yes"
+                                WITH_IBVERBS="yes"
+                        ;;
+                        --without-libcxgb3)
+                                WITH_CXGB3="no"
+                        ;;
                         --with-libibcm)
                                 WITH_CM="yes"
                                 WITH_MTHCA="yes"
@@ -410,6 +420,7 @@ main()
                                 # WITH_DAPL="yes"
                                 WITH_DIAGS="yes"
                                 # WITH_EHCA="yes"
+                                WITH_CXGB3="yes"
                                 WITH_IBCOMMON="yes"
                                 WITH_IBMAD="yes"
                                 WITH_IBUMAD="yes"
@@ -460,6 +471,7 @@ WITH_IBVERBS=${WITH_IBVERBS:-"no"}
 WITH_MTHCA=${WITH_MTHCA:-"no"}
 WITH_IPATHVERBS=${WITH_IPATHVERBS:-"no"}
 WITH_EHCA=${WITH_EHCA:-"no"}
+WITH_CXGB3=${WITH_CXGB3:-"no"}
 WITH_CM=${WITH_CM:-"no"}
 WITH_SDP=${WITH_SDP:-"no"}
 WITH_DAPL=${WITH_DAPL:-"no"}
@@ -501,6 +513,7 @@ WITH_IBVERBS=${WITH_IBVERBS}
 WITH_MTHCA=${WITH_MTHCA}
 WITH_IPATHVERBS=${WITH_IPATHVERBS}
 WITH_EHCA=${WITH_EHCA}
+WITH_CXGB3=${WITH_CXGB3}
 WITH_CM=${WITH_CM}
 WITH_SDP=${WITH_SDP}
 WITH_DAPL=${WITH_DAPL}
@@ -539,6 +552,9 @@ EOFCONFIG
         if [ "${WITH_EHCA}" == "yes" ]; then
             ullibs="${ullibs} libehca"
         fi
+        if [ "${WITH_CXGB3}" == "yes" ]; then
+            ullibs="${ullibs} libcxgb3"
+        fi
         if [ "${WITH_CM}" == "yes" ]; then
             ullibs="${ullibs} libibcm"
         fi