File papi-infiniband.patch of Package papi

Overview Repositories Revisions Requests Users Attributes Meta

File papi-infiniband.patch of Package papi (Revision 995ef4427bfe2bc28940a2db347c8b87)

Currently displaying revision 995ef4427bfe2bc28940a2db347c8b87 , Show latest

Index: src/components/infiniband/Rules.infiniband
===================================================================
--- src/components/infiniband/Rules.infiniband.orig	2010-06-17 22:53:50.000000000 +0200
+++ src/components/infiniband/Rules.infiniband	2012-02-23 14:34:03.084610321 +0100
@@ -4,8 +4,13 @@ include components/infiniband/Makefile.i
 
 COMPSRCS += components/infiniband/linux-infiniband.c
 COMPOBJS += linux-infiniband.o
-CFLAGS += -I$(INFINIBAND_INCDIR)
-LDFLAGS += -L$(INFINIBAND_LIBDIR) -libmad -libumad
+ifdef $(INFINIBAND_INCDIR)
+    CFLAGS += -I$(INFINIBAND_INCDIR)
+endif
+ifdef $(INFINIBAND_LIBDIR)
+    LDFLAGS += -L$(INFINIBAND_LIBDIR)
+endif
+LDFLAGS += -libmad -libumad
 
 linux-infiniband.o: components/infiniband/linux-infiniband.c components/infiniband/linux-infiniband.h $(HEADERS)
 	$(CC) $(LIBCFLAGS) $(OPTFLAGS) -c components/infiniband/linux-infiniband.c -o linux-infiniband.o
\ No newline at end of file
Index: src/components/infiniband/configure.in
===================================================================
--- src/components/infiniband/configure.in.orig	2010-06-17 22:53:50.000000000 +0200
+++ src/components/infiniband/configure.in	2012-02-23 14:32:48.493406286 +0100
@@ -4,42 +4,48 @@
 
 AC_INIT
 
+AC_PREREQ([2.62])
 # looking for infiniband header files
 AC_ARG_WITH(infiniband_incdir,
-			[  --with-infiniband_incdir=<path>  Specify path to InfiniBand header files ],
+			AS_HELP_STRING([--with-infiniband_incdir=<path>],
+			               [Specify path to InfiniBand header files], [30]),
 			[case "$with_infiniband_incdir" in 
 			yes|''|no) AC_MSG_ERROR([--with-infiniband_incdir requires a path]) ;;
 			*) infiniband_incdir=$with_infiniband_incdir ;;
-			esac],
-			[infiniband_incdir="/usr/include/infiniband"])
+			esac])
 
-CFLAGS="$CFLAGS -I$infiniband_incdir"
-AC_CHECK_HEADERS([mad.h umad.h],
+if test ! -z "$infiniband_incdir"; then
+    CFLAGS="$CFLAGS -I$infiniband_incdir"
+fi
+AC_CHECK_HEADERS([infiniband/mad.h infiniband/umad.h],
 				 [AC_DEFINE([HAVE_INFINIBAND_H], [1], [infiniband header] )],
 				 [AC_MSG_ERROR([mad.h, umad.h not found. See --with-infiniband_incdir ])],
-				 [#include <mad.h> #include <umad.h>])
+				 [#include <infiniband/mad.h> #include <infiniband/umad.h>])
 				 
 				 
 				 
 # looking for infiniband libraries
+
 AC_ARG_WITH(infiniband_libdir,
 			[  --with-infiniband_libdir=<path>  Specify path to InfiniBand libraries ],
 			[case "$with_infiniband_libdir" in 
 			yes|''|no) AC_MSG_ERROR([--with-infiniband_libdir requires a path]) ;;
 			*) infiniband_libdir=$with_infiniband_libdir ;;
-			esac],
-			[infiniband_libdir="/usr/lib64"])
+			esac])
 
-LDFLAGS="$LDFLAGS -L$infiniband_libdir -libmad -libumad"
+if test ! -z "$infiniband_libdir"; then
+    LDFLAGS="$LDFLAGS -L$infiniband_libdir"
+fi
+LDFLAGS="$LDFLAGS -libmad -libumad"
 AC_CHECK_LIB([ibmad],
 			 [madrpc_init],
 			 [],
-			 [AC_MSG_ERROR([libibmad.a is needed for the PAPI infiniband component])])
+			 [AC_MSG_ERROR([libibmad is needed for the PAPI infiniband component])])
 			 
 AC_CHECK_LIB([ibumad],
 			 [umad_init],
 			 [],
-			 [AC_MSG_ERROR([libibumad.a is needed for the PAPI infiniband component])])
+			 [AC_MSG_ERROR([libibumad is needed for the PAPI infiniband component])])
 
 
 
Index: src/components/infiniband/linux-infiniband.h
===================================================================
--- src/components/infiniband/linux-infiniband.h.orig	2012-02-07 18:16:35.000000000 +0100
+++ src/components/infiniband/linux-infiniband.h	2012-02-23 14:26:13.847917999 +0100
@@ -26,8 +26,8 @@
 
 #define __BUILD_VERSION_TAG__ 1.2
 
-#include <umad.h>
-#include <mad.h>
+#include <infiniband/umad.h>
+#include <infiniband/mad.h>
 
 /* describes a single counter with its properties */
 typedef struct counter_info_struct

Places

File papi-infiniband.patch of Package papi (Revision 995ef4427bfe2bc28940a2db347c8b87)

Places