[Pkg-ofed-commits] [libmthca] 07/13: Imported Upstream version 1.0.4
Ana Beatriz Guerrero López
ana at moszumanska.debian.org
Wed Jul 2 13:50:51 UTC 2014
This is an automated email from the git hooks/post-receive script.
ana pushed a commit to branch master
in repository libmthca.
commit 0803ba29a109ce91060d25662880599a4bbdc6e5
Author: Ana Guerrero López <ana at ekaia.org>
Date: Wed Jul 2 15:50:33 2014 +0200
Imported Upstream version 1.0.4
---
Makefile.am | 27 ++++---
Makefile.in | 236 ++++++++++++++++++++++++++++++++++++------------------
config.h.in | 6 +-
config/compile | 4 +-
config/depcomp | 9 ++-
config/install-sh | 2 +-
config/missing | 9 ++-
configure | 215 ++++++++++++-------------------------------------
configure.in | 30 +++++--
libmthca.spec | 36 +++++----
libmthca.spec.in | 36 +++++----
mthca.driver | 1 +
src/ah.c | 2 -
src/buf.c | 2 -
src/cq.c | 2 -
src/doorbell.h | 4 +-
src/memfree.c | 2 -
src/mthca-abi.h | 4 +-
src/mthca.c | 31 ++++---
src/mthca.h | 2 -
src/qp.c | 6 +-
src/srq.c | 2 -
src/verbs.c | 19 +++--
src/wqe.h | 2 -
24 files changed, 343 insertions(+), 346 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 0d8ce6a..e9be461 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,22 +1,29 @@
-# $Id: Makefile.am 10049 2006-11-02 22:19:07Z roland $
-
-mthcalibdir = $(libdir)/infiniband
-
-mthcalib_LTLIBRARIES = src/mthca.la
-
-src_mthca_la_CFLAGS = -g -Wall -D_GNU_SOURCE
+AM_CFLAGS = -g -Wall -D_GNU_SOURCE
mthca_version_script = @MTHCA_VERSION_SCRIPT@
-src_mthca_la_SOURCES = src/ah.c src/buf.c src/cq.c src/memfree.c src/mthca.c \
+MTHCA_SOURCES = src/ah.c src/buf.c src/cq.c src/memfree.c src/mthca.c \
src/qp.c src/srq.c src/verbs.c
-src_mthca_la_LDFLAGS = -avoid-version -module $(mthca_version_script)
+
+if HAVE_IBV_DEVICE_LIBRARY_EXTENSION
+ lib_LTLIBRARIES = src/libmthca.la
+ src_libmthca_la_SOURCES = $(MTHCA_SOURCES)
+ src_libmthca_la_LDFLAGS = -avoid-version -release @IBV_DEVICE_LIBRARY_EXTENSION@ \
+ $(mthca_version_script)
+ mthcaconfdir = $(sysconfdir)/libibverbs.d
+ mthcaconf_DATA = mthca.driver
+else
+ mthcalibdir = $(libdir)/infiniband
+ mthcalib_LTLIBRARIES = src/mthca.la
+ src_mthca_la_SOURCES = $(MTHCA_SOURCES)
+ src_mthca_la_LDFLAGS = -avoid-version -module $(mthca_version_script)
+endif
DEBIAN = debian/changelog debian/compat debian/control debian/copyright \
debian/libmthca1.install debian/libmthca-dev.install debian/rules
EXTRA_DIST = src/doorbell.h src/mthca.h src/mthca-abi.h src/wqe.h \
- src/mthca.map libmthca.spec.in
+ src/mthca.map libmthca.spec.in mthca.driver
dist-hook: libmthca.spec
cp libmthca.spec $(distdir)
diff --git a/Makefile.in b/Makefile.in
index 15cbd8b..1ec9005 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,6 @@
@SET_MAKE@
-# $Id: Makefile.am 10049 2006-11-02 22:19:07Z roland $
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -60,16 +59,30 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(mthcalibdir)"
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(mthcalibdir)" \
+ "$(DESTDIR)$(mthcaconfdir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
mthcalibLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(mthcalib_LTLIBRARIES)
+LTLIBRARIES = $(lib_LTLIBRARIES) $(mthcalib_LTLIBRARIES)
+src_libmthca_la_LIBADD =
+am__src_libmthca_la_SOURCES_DIST = src/ah.c src/buf.c src/cq.c \
+ src/memfree.c src/mthca.c src/qp.c src/srq.c src/verbs.c
+am__objects_1 = ah.lo buf.lo cq.lo memfree.lo mthca.lo qp.lo srq.lo \
+ verbs.lo
+ at HAVE_IBV_DEVICE_LIBRARY_EXTENSION_TRUE@am_src_libmthca_la_OBJECTS = \
+ at HAVE_IBV_DEVICE_LIBRARY_EXTENSION_TRUE@ $(am__objects_1)
+src_libmthca_la_OBJECTS = $(am_src_libmthca_la_OBJECTS)
+ at HAVE_IBV_DEVICE_LIBRARY_EXTENSION_TRUE@am_src_libmthca_la_rpath = \
+ at HAVE_IBV_DEVICE_LIBRARY_EXTENSION_TRUE@ -rpath $(libdir)
+am__dirstamp = $(am__leading_dot)dirstamp
src_mthca_la_LIBADD =
-am_src_mthca_la_OBJECTS = src_mthca_la-ah.lo src_mthca_la-buf.lo \
- src_mthca_la-cq.lo src_mthca_la-memfree.lo \
- src_mthca_la-mthca.lo src_mthca_la-qp.lo src_mthca_la-srq.lo \
- src_mthca_la-verbs.lo
+am__src_mthca_la_SOURCES_DIST = src/ah.c src/buf.c src/cq.c \
+ src/memfree.c src/mthca.c src/qp.c src/srq.c src/verbs.c
+ at HAVE_IBV_DEVICE_LIBRARY_EXTENSION_FALSE@am_src_mthca_la_OBJECTS = \
+ at HAVE_IBV_DEVICE_LIBRARY_EXTENSION_FALSE@ $(am__objects_1)
src_mthca_la_OBJECTS = $(am_src_mthca_la_OBJECTS)
-am__dirstamp = $(am__leading_dot)dirstamp
+ at HAVE_IBV_DEVICE_LIBRARY_EXTENSION_FALSE@am_src_mthca_la_rpath = \
+ at HAVE_IBV_DEVICE_LIBRARY_EXTENSION_FALSE@ -rpath $(mthcalibdir)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
@@ -81,8 +94,11 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(src_mthca_la_SOURCES)
-DIST_SOURCES = $(src_mthca_la_SOURCES)
+SOURCES = $(src_libmthca_la_SOURCES) $(src_mthca_la_SOURCES)
+DIST_SOURCES = $(am__src_libmthca_la_SOURCES_DIST) \
+ $(am__src_mthca_la_SOURCES_DIST)
+mthcaconfDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(mthcaconf_DATA)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -125,6 +141,9 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+HAVE_IBV_DEVICE_LIBRARY_EXTENSION_FALSE = @HAVE_IBV_DEVICE_LIBRARY_EXTENSION_FALSE@
+HAVE_IBV_DEVICE_LIBRARY_EXTENSION_TRUE = @HAVE_IBV_DEVICE_LIBRARY_EXTENSION_TRUE@
+IBV_DEVICE_LIBRARY_EXTENSION = @IBV_DEVICE_LIBRARY_EXTENSION@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -194,19 +213,27 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-mthcalibdir = $(libdir)/infiniband
-mthcalib_LTLIBRARIES = src/mthca.la
-src_mthca_la_CFLAGS = -g -Wall -D_GNU_SOURCE
+AM_CFLAGS = -g -Wall -D_GNU_SOURCE
mthca_version_script = @MTHCA_VERSION_SCRIPT@
-src_mthca_la_SOURCES = src/ah.c src/buf.c src/cq.c src/memfree.c src/mthca.c \
+MTHCA_SOURCES = src/ah.c src/buf.c src/cq.c src/memfree.c src/mthca.c \
src/qp.c src/srq.c src/verbs.c
-src_mthca_la_LDFLAGS = -avoid-version -module $(mthca_version_script)
+ at HAVE_IBV_DEVICE_LIBRARY_EXTENSION_TRUE@lib_LTLIBRARIES = src/libmthca.la
+ at HAVE_IBV_DEVICE_LIBRARY_EXTENSION_TRUE@src_libmthca_la_SOURCES = $(MTHCA_SOURCES)
+ at HAVE_IBV_DEVICE_LIBRARY_EXTENSION_TRUE@src_libmthca_la_LDFLAGS = -avoid-version -release @IBV_DEVICE_LIBRARY_EXTENSION@ \
+ at HAVE_IBV_DEVICE_LIBRARY_EXTENSION_TRUE@ $(mthca_version_script)
+
+ at HAVE_IBV_DEVICE_LIBRARY_EXTENSION_TRUE@mthcaconfdir = $(sysconfdir)/libibverbs.d
+ at HAVE_IBV_DEVICE_LIBRARY_EXTENSION_TRUE@mthcaconf_DATA = mthca.driver
+ at HAVE_IBV_DEVICE_LIBRARY_EXTENSION_FALSE@mthcalibdir = $(libdir)/infiniband
+ at HAVE_IBV_DEVICE_LIBRARY_EXTENSION_FALSE@mthcalib_LTLIBRARIES = src/mthca.la
+ at HAVE_IBV_DEVICE_LIBRARY_EXTENSION_FALSE@src_mthca_la_SOURCES = $(MTHCA_SOURCES)
+ at HAVE_IBV_DEVICE_LIBRARY_EXTENSION_FALSE@src_mthca_la_LDFLAGS = -avoid-version -module $(mthca_version_script)
DEBIAN = debian/changelog debian/compat debian/control debian/copyright \
debian/libmthca1.install debian/libmthca-dev.install debian/rules
EXTRA_DIST = src/doorbell.h src/mthca.h src/mthca-abi.h src/wqe.h \
- src/mthca.map libmthca.spec.in
+ src/mthca.map libmthca.spec.in mthca.driver
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -265,6 +292,33 @@ distclean-hdr:
-rm -f config.h stamp-h1
libmthca.spec: $(top_builddir)/config.status $(srcdir)/libmthca.spec.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+
+clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
install-mthcalibLTLIBRARIES: $(mthcalib_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(mthcalibdir)" || $(mkdir_p) "$(DESTDIR)$(mthcalibdir)"
@@ -295,8 +349,10 @@ clean-mthcalibLTLIBRARIES:
src/$(am__dirstamp):
@$(mkdir_p) src
@: > src/$(am__dirstamp)
+src/libmthca.la: $(src_libmthca_la_OBJECTS) $(src_libmthca_la_DEPENDENCIES) src/$(am__dirstamp)
+ $(LINK) $(am_src_libmthca_la_rpath) $(src_libmthca_la_LDFLAGS) $(src_libmthca_la_OBJECTS) $(src_libmthca_la_LIBADD) $(LIBS)
src/mthca.la: $(src_mthca_la_OBJECTS) $(src_mthca_la_DEPENDENCIES) src/$(am__dirstamp)
- $(LINK) -rpath $(mthcalibdir) $(src_mthca_la_LDFLAGS) $(src_mthca_la_OBJECTS) $(src_mthca_la_LIBADD) $(LIBS)
+ $(LINK) $(am_src_mthca_la_rpath) $(src_mthca_la_LDFLAGS) $(src_mthca_la_OBJECTS) $(src_mthca_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -304,14 +360,14 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/src_mthca_la-ah.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/src_mthca_la-buf.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/src_mthca_la-cq.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/src_mthca_la-memfree.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/src_mthca_la-mthca.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/src_mthca_la-qp.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/src_mthca_la-srq.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/src_mthca_la-verbs.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ah.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/buf.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cq.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/memfree.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mthca.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/qp.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/srq.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/verbs.Plo at am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -334,61 +390,61 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-src_mthca_la-ah.lo: src/ah.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_mthca_la_CFLAGS) $(CFLAGS) -MT src_mthca_la-ah.lo -MD -MP -MF "$(DEPDIR)/src_mthca_la-ah.Tpo" -c -o src_mthca_la-ah.lo `test -f 'src/ah.c' || echo '$(srcdir)/'`src/ah.c; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/src_mthca_la-ah.Tpo" "$(DEPDIR)/src_mthca_la-ah.Plo"; else rm -f "$(DEPDIR)/src_mthca_la-ah.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/ah.c' object='src_mthca_la-ah.lo' libtool=yes @AMDEPBACKSLASH@
+ah.lo: src/ah.c
+ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ah.lo -MD -MP -MF "$(DEPDIR)/ah.Tpo" -c -o ah.lo `test -f 'src/ah.c' || echo '$(srcdir)/'`src/ah.c; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/ah.Tpo" "$(DEPDIR)/ah.Plo"; else rm -f "$(DEPDIR)/ah.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/ah.c' object='ah.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_mthca_la_CFLAGS) $(CFLAGS) -c -o src_mthca_la-ah.lo `test -f 'src/ah.c' || echo '$(srcdir)/'`src/ah.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ah.lo `test -f 'src/ah.c' || echo '$(srcdir)/'`src/ah.c
-src_mthca_la-buf.lo: src/buf.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_mthca_la_CFLAGS) $(CFLAGS) -MT src_mthca_la-buf.lo -MD -MP -MF "$(DEPDIR)/src_mthca_la-buf.Tpo" -c -o src_mthca_la-buf.lo `test -f 'src/buf.c' || echo '$(srcdir)/'`src/buf.c; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/src_mthca_la-buf.Tpo" "$(DEPDIR)/src_mthca_la-buf.Plo"; else rm -f "$(DEPDIR)/src_mthca_la-buf.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/buf.c' object='src_mthca_la-buf.lo' libtool=yes @AMDEPBACKSLASH@
+buf.lo: src/buf.c
+ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT buf.lo -MD -MP -MF "$(DEPDIR)/buf.Tpo" -c -o buf.lo `test -f 'src/buf.c' || echo '$(srcdir)/'`src/buf.c; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/buf.Tpo" "$(DEPDIR)/buf.Plo"; else rm -f "$(DEPDIR)/buf.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/buf.c' object='buf.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_mthca_la_CFLAGS) $(CFLAGS) -c -o src_mthca_la-buf.lo `test -f 'src/buf.c' || echo '$(srcdir)/'`src/buf.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o buf.lo `test -f 'src/buf.c' || echo '$(srcdir)/'`src/buf.c
-src_mthca_la-cq.lo: src/cq.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_mthca_la_CFLAGS) $(CFLAGS) -MT src_mthca_la-cq.lo -MD -MP -MF "$(DEPDIR)/src_mthca_la-cq.Tpo" -c -o src_mthca_la-cq.lo `test -f 'src/cq.c' || echo '$(srcdir)/'`src/cq.c; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/src_mthca_la-cq.Tpo" "$(DEPDIR)/src_mthca_la-cq.Plo"; else rm -f "$(DEPDIR)/src_mthca_la-cq.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/cq.c' object='src_mthca_la-cq.lo' libtool=yes @AMDEPBACKSLASH@
+cq.lo: src/cq.c
+ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cq.lo -MD -MP -MF "$(DEPDIR)/cq.Tpo" -c -o cq.lo `test -f 'src/cq.c' || echo '$(srcdir)/'`src/cq.c; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cq.Tpo" "$(DEPDIR)/cq.Plo"; else rm -f "$(DEPDIR)/cq.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/cq.c' object='cq.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_mthca_la_CFLAGS) $(CFLAGS) -c -o src_mthca_la-cq.lo `test -f 'src/cq.c' || echo '$(srcdir)/'`src/cq.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cq.lo `test -f 'src/cq.c' || echo '$(srcdir)/'`src/cq.c
-src_mthca_la-memfree.lo: src/memfree.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_mthca_la_CFLAGS) $(CFLAGS) -MT src_mthca_la-memfree.lo -MD -MP -MF "$(DEPDIR)/src_mthca_la-memfree.Tpo" -c -o src_mthca_la-memfree.lo `test -f 'src/memfree.c' || echo '$(srcdir)/'`src/memfree.c; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/src_mthca_la-memfree.Tpo" "$(DEPDIR)/src_mthca_la-memfree.Plo"; else rm -f "$(DEPDIR)/src_mthca_la-memfree.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/memfree.c' object='src_mthca_la-memfree.lo' libtool=yes @AMDEPBACKSLASH@
+memfree.lo: src/memfree.c
+ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT memfree.lo -MD -MP -MF "$(DEPDIR)/memfree.Tpo" -c -o memfree.lo `test -f 'src/memfree.c' || echo '$(srcdir)/'`src/memfree.c; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/memfree.Tpo" "$(DEPDIR)/memfree.Plo"; else rm -f "$(DEPDIR)/memfree.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/memfree.c' object='memfree.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_mthca_la_CFLAGS) $(CFLAGS) -c -o src_mthca_la-memfree.lo `test -f 'src/memfree.c' || echo '$(srcdir)/'`src/memfree.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o memfree.lo `test -f 'src/memfree.c' || echo '$(srcdir)/'`src/memfree.c
-src_mthca_la-mthca.lo: src/mthca.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_mthca_la_CFLAGS) $(CFLAGS) -MT src_mthca_la-mthca.lo -MD -MP -MF "$(DEPDIR)/src_mthca_la-mthca.Tpo" -c -o src_mthca_la-mthca.lo `test -f 'src/mthca.c' || echo '$(srcdir)/'`src/mthca.c; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/src_mthca_la-mthca.Tpo" "$(DEPDIR)/src_mthca_la-mthca.Plo"; else rm -f "$(DEPDIR)/src_mthca_la-mthca.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/mthca.c' object='src_mthca_la-mthca.lo' libtool=yes @AMDEPBACKSLASH@
+mthca.lo: src/mthca.c
+ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mthca.lo -MD -MP -MF "$(DEPDIR)/mthca.Tpo" -c -o mthca.lo `test -f 'src/mthca.c' || echo '$(srcdir)/'`src/mthca.c; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mthca.Tpo" "$(DEPDIR)/mthca.Plo"; else rm -f "$(DEPDIR)/mthca.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/mthca.c' object='mthca.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_mthca_la_CFLAGS) $(CFLAGS) -c -o src_mthca_la-mthca.lo `test -f 'src/mthca.c' || echo '$(srcdir)/'`src/mthca.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mthca.lo `test -f 'src/mthca.c' || echo '$(srcdir)/'`src/mthca.c
-src_mthca_la-qp.lo: src/qp.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_mthca_la_CFLAGS) $(CFLAGS) -MT src_mthca_la-qp.lo -MD -MP -MF "$(DEPDIR)/src_mthca_la-qp.Tpo" -c -o src_mthca_la-qp.lo `test -f 'src/qp.c' || echo '$(srcdir)/'`src/qp.c; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/src_mthca_la-qp.Tpo" "$(DEPDIR)/src_mthca_la-qp.Plo"; else rm -f "$(DEPDIR)/src_mthca_la-qp.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/qp.c' object='src_mthca_la-qp.lo' libtool=yes @AMDEPBACKSLASH@
+qp.lo: src/qp.c
+ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT qp.lo -MD -MP -MF "$(DEPDIR)/qp.Tpo" -c -o qp.lo `test -f 'src/qp.c' || echo '$(srcdir)/'`src/qp.c; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/qp.Tpo" "$(DEPDIR)/qp.Plo"; else rm -f "$(DEPDIR)/qp.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/qp.c' object='qp.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_mthca_la_CFLAGS) $(CFLAGS) -c -o src_mthca_la-qp.lo `test -f 'src/qp.c' || echo '$(srcdir)/'`src/qp.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o qp.lo `test -f 'src/qp.c' || echo '$(srcdir)/'`src/qp.c
-src_mthca_la-srq.lo: src/srq.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_mthca_la_CFLAGS) $(CFLAGS) -MT src_mthca_la-srq.lo -MD -MP -MF "$(DEPDIR)/src_mthca_la-srq.Tpo" -c -o src_mthca_la-srq.lo `test -f 'src/srq.c' || echo '$(srcdir)/'`src/srq.c; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/src_mthca_la-srq.Tpo" "$(DEPDIR)/src_mthca_la-srq.Plo"; else rm -f "$(DEPDIR)/src_mthca_la-srq.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/srq.c' object='src_mthca_la-srq.lo' libtool=yes @AMDEPBACKSLASH@
+srq.lo: src/srq.c
+ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT srq.lo -MD -MP -MF "$(DEPDIR)/srq.Tpo" -c -o srq.lo `test -f 'src/srq.c' || echo '$(srcdir)/'`src/srq.c; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/srq.Tpo" "$(DEPDIR)/srq.Plo"; else rm -f "$(DEPDIR)/srq.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/srq.c' object='srq.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_mthca_la_CFLAGS) $(CFLAGS) -c -o src_mthca_la-srq.lo `test -f 'src/srq.c' || echo '$(srcdir)/'`src/srq.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o srq.lo `test -f 'src/srq.c' || echo '$(srcdir)/'`src/srq.c
-src_mthca_la-verbs.lo: src/verbs.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_mthca_la_CFLAGS) $(CFLAGS) -MT src_mthca_la-verbs.lo -MD -MP -MF "$(DEPDIR)/src_mthca_la-verbs.Tpo" -c -o src_mthca_la-verbs.lo `test -f 'src/verbs.c' || echo '$(srcdir)/'`src/verbs.c; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/src_mthca_la-verbs.Tpo" "$(DEPDIR)/src_mthca_la-verbs.Plo"; else rm -f "$(DEPDIR)/src_mthca_la-verbs.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/verbs.c' object='src_mthca_la-verbs.lo' libtool=yes @AMDEPBACKSLASH@
+verbs.lo: src/verbs.c
+ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT verbs.lo -MD -MP -MF "$(DEPDIR)/verbs.Tpo" -c -o verbs.lo `test -f 'src/verbs.c' || echo '$(srcdir)/'`src/verbs.c; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/verbs.Tpo" "$(DEPDIR)/verbs.Plo"; else rm -f "$(DEPDIR)/verbs.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/verbs.c' object='verbs.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_mthca_la_CFLAGS) $(CFLAGS) -c -o src_mthca_la-verbs.lo `test -f 'src/verbs.c' || echo '$(srcdir)/'`src/verbs.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o verbs.lo `test -f 'src/verbs.c' || echo '$(srcdir)/'`src/verbs.c
mostlyclean-libtool:
-rm -f *.lo
@@ -400,6 +456,23 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
+install-mthcaconfDATA: $(mthcaconf_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(mthcaconfdir)" || $(mkdir_p) "$(DESTDIR)$(mthcaconfdir)"
+ @list='$(mthcaconf_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(mthcaconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mthcaconfdir)/$$f'"; \
+ $(mthcaconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mthcaconfdir)/$$f"; \
+ done
+
+uninstall-mthcaconfDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(mthcaconf_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(mthcaconfdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(mthcaconfdir)/$$f"; \
+ done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -581,9 +654,9 @@ distcleancheck: distclean
exit 1; } >&2
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) config.h
+all-am: Makefile $(LTLIBRARIES) $(DATA) config.h
installdirs:
- for dir in "$(DESTDIR)$(mthcalibdir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(mthcalibdir)" "$(DESTDIR)$(mthcaconfdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -613,8 +686,8 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-mthcalibLTLIBRARIES \
- mostlyclean-am
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ clean-mthcalibLTLIBRARIES mostlyclean-am
distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -633,9 +706,9 @@ info: info-am
info-am:
-install-data-am: install-mthcalibLTLIBRARIES
+install-data-am: install-mthcaconfDATA install-mthcalibLTLIBRARIES
-install-exec-am:
+install-exec-am: install-libLTLIBRARIES
install-info: install-info-am
@@ -663,22 +736,25 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-info-am uninstall-mthcalibLTLIBRARIES
+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
+ uninstall-mthcaconfDATA uninstall-mthcalibLTLIBRARIES
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
- clean-generic clean-libtool clean-mthcalibLTLIBRARIES ctags \
- dist dist-all dist-bzip2 dist-gzip dist-hook dist-shar \
- dist-tarZ dist-zip distcheck distclean distclean-compile \
- distclean-generic distclean-hdr distclean-libtool \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-man \
+ clean-generic clean-libLTLIBRARIES clean-libtool \
+ clean-mthcalibLTLIBRARIES ctags dist dist-all dist-bzip2 \
+ dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
+ distclean distclean-compile distclean-generic distclean-hdr \
+ distclean-libtool distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am \
+ install-libLTLIBRARIES install-man install-mthcaconfDATA \
install-mthcalibLTLIBRARIES install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-info-am \
+ uninstall-libLTLIBRARIES uninstall-mthcaconfDATA \
uninstall-mthcalibLTLIBRARIES
diff --git a/config.h.in b/config.h.in
index 40b4eba..c9b15ec 100644
--- a/config.h.in
+++ b/config.h.in
@@ -12,6 +12,9 @@
/* Define to 1 if you have the `ibv_read_sysfs_file' function. */
#undef HAVE_IBV_READ_SYSFS_FILE
+/* Define to 1 if you have the `ibv_register_driver' function. */
+#undef HAVE_IBV_REGISTER_DRIVER
+
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
@@ -33,9 +36,6 @@
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
-/* Define to 1 if you have the <sysfs/libsysfs.h> header file. */
-#undef HAVE_SYSFS_LIBSYSFS_H
-
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
diff --git a/config/compile b/config/compile
index ad57e2f..1b1d232 100755
--- a/config/compile
+++ b/config/compile
@@ -1,7 +1,7 @@
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
-scriptversion=2005-02-03.08
+scriptversion=2005-05-14.22
# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey at cygnus.com>.
@@ -18,7 +18,7 @@ scriptversion=2005-02-03.08
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff --git a/config/depcomp b/config/depcomp
index ffcd540..04701da 100755
--- a/config/depcomp
+++ b/config/depcomp
@@ -1,7 +1,7 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2005-02-09.22
+scriptversion=2005-07-09.11
# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
@@ -17,8 +17,8 @@ scriptversion=2005-02-09.22
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -467,7 +467,8 @@ cpp)
done
"$@" -E |
- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
diff --git a/config/install-sh b/config/install-sh
index 1a83534..4d4a951 100755
--- a/config/install-sh
+++ b/config/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2005-02-02.21
+scriptversion=2005-05-14.22
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
diff --git a/config/missing b/config/missing
index 09edd88..894e786 100755
--- a/config/missing
+++ b/config/missing
@@ -1,7 +1,7 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-02-08.22
+scriptversion=2005-06-08.21
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
@@ -19,8 +19,8 @@ scriptversion=2005-02-08.22
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -297,6 +297,9 @@ WARNING: \`$1' is $msg. You should only need it if
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
diff --git a/configure b/configure
index 8a50183..1c5aa08 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for libmthca 1.0.3.
+# Generated by GNU Autoconf 2.59 for libmthca 1.0.4.
#
# Report bugs to <openib-general at openib.org>.
#
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libmthca'
PACKAGE_TARNAME='libmthca'
-PACKAGE_VERSION='1.0.3'
-PACKAGE_STRING='libmthca 1.0.3'
+PACKAGE_VERSION='1.0.4'
+PACKAGE_STRING='libmthca 1.0.4'
PACKAGE_BUGREPORT='openib-general at openib.org'
ac_unique_file="src/mthca.h"
@@ -465,7 +465,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INS [...]
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INS [...]
ac_subst_files=''
# Initialize some variables set by options.
@@ -954,7 +954,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libmthca 1.0.3 to adapt to many kinds of systems.
+\`configure' configures libmthca 1.0.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1020,7 +1020,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libmthca 1.0.3:";;
+ short | recursive ) echo "Configuration of libmthca 1.0.4:";;
esac
cat <<\_ACEOF
@@ -1161,7 +1161,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-libmthca configure 1.0.3
+libmthca configure 1.0.4
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1175,7 +1175,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libmthca $as_me 1.0.3, which was
+It was created by libmthca $as_me 1.0.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1821,7 +1821,7 @@ fi
# Define the identity of the package.
PACKAGE=libmthca
- VERSION=1.0.3
+ VERSION=1.0.4
cat >>confdefs.h <<_ACEOF
@@ -19866,156 +19866,6 @@ _ACEOF
fi
-
-for ac_header in sysfs/libsysfs.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ---------------------------------------- ##
-## Report this to openib-general at openib.org ##
-## ---------------------------------------- ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
if test "${ac_cv_header_valgrind_memcheck_h+set}" = set; then
echo "$as_me:$LINENO: checking for valgrind/memcheck.h" >&5
echo $ECHO_N "checking for valgrind/memcheck.h... $ECHO_C" >&6
@@ -20692,7 +20542,9 @@ _ACEOF
-for ac_func in ibv_read_sysfs_file ibv_dontfork_range ibv_dofork_range
+
+for ac_func in ibv_read_sysfs_file ibv_dontfork_range ibv_dofork_range \
+ ibv_register_driver
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -20794,20 +20646,45 @@ fi
done
+dummy=if$$
+cat <<IBV_VERSION > $dummy.c
+#include <infiniband/driver.h>
+IBV_DEVICE_LIBRARY_EXTENSION
+IBV_VERSION
+IBV_DEVICE_LIBRARY_EXTENSION=`$CC $CPPFLAGS -E $dummy.c 2> /dev/null | tail -1`
+rm -f $dummy.c
+
+
+if test $IBV_DEVICE_LIBRARY_EXTENSION != IBV_DEVICE_LIBRARY_EXTENSION; then
+ HAVE_IBV_DEVICE_LIBRARY_EXTENSION_TRUE=
+ HAVE_IBV_DEVICE_LIBRARY_EXTENSION_FALSE='#'
+else
+ HAVE_IBV_DEVICE_LIBRARY_EXTENSION_TRUE='#'
+ HAVE_IBV_DEVICE_LIBRARY_EXTENSION_FALSE=
+fi
+
+
+
echo "$as_me:$LINENO: checking whether ld accepts --version-script" >&5
echo $ECHO_N "checking whether ld accepts --version-script... $ECHO_C" >&6
if test "${ac_cv_version_script+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "`$LD --help < /dev/null 2>/dev/null | grep version-script`"; then
- MTHCA_VERSION_SCRIPT='-Wl,--version-script=$(srcdir)/src/mthca.map'
+ ac_cv_version_script=yes
else
- MTHCA_VERSION_SCRIPT=
+ ac_cv_version_script=no
fi
fi
echo "$as_me:$LINENO: result: $ac_cv_version_script" >&5
echo "${ECHO_T}$ac_cv_version_script" >&6
+if test $ac_cv_version_script = yes; then
+ MTHCA_VERSION_SCRIPT='-Wl,--version-script=$(srcdir)/src/mthca.map'
+else
+ MTHCA_VERSION_SCRIPT=
+fi
+
ac_config_files="$ac_config_files Makefile libmthca.spec"
@@ -20930,6 +20807,13 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${HAVE_IBV_DEVICE_LIBRARY_EXTENSION_TRUE}" && test -z "${HAVE_IBV_DEVICE_LIBRARY_EXTENSION_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_IBV_DEVICE_LIBRARY_EXTENSION\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_IBV_DEVICE_LIBRARY_EXTENSION\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -21201,7 +21085,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by libmthca $as_me 1.0.3, which was
+This file was extended by libmthca $as_me 1.0.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21264,7 +21148,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libmthca config.status 1.0.3
+libmthca config.status 1.0.4
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -21529,6 +21413,9 @@ s, at F77@,$F77,;t t
s, at FFLAGS@,$FFLAGS,;t t
s, at ac_ct_F77@,$ac_ct_F77,;t t
s, at LIBTOOL@,$LIBTOOL,;t t
+s, at HAVE_IBV_DEVICE_LIBRARY_EXTENSION_TRUE@,$HAVE_IBV_DEVICE_LIBRARY_EXTENSION_TRUE,;t t
+s, at HAVE_IBV_DEVICE_LIBRARY_EXTENSION_FALSE@,$HAVE_IBV_DEVICE_LIBRARY_EXTENSION_FALSE,;t t
+s, at IBV_DEVICE_LIBRARY_EXTENSION@,$IBV_DEVICE_LIBRARY_EXTENSION,;t t
s, at MTHCA_VERSION_SCRIPT@,$MTHCA_VERSION_SCRIPT,;t t
s, at LIBOBJS@,$LIBOBJS,;t t
s, at LTLIBOBJS@,$LTLIBOBJS,;t t
diff --git a/configure.in b/configure.in
index ffaf3bf..cf1f572 100644
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,11 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
-AC_INIT(libmthca, 1.0.3, openib-general at openib.org)
+AC_INIT(libmthca, 1.0.4, openib-general at openib.org)
AC_CONFIG_SRCDIR([src/mthca.h])
AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libmthca, 1.0.3)
+AM_INIT_AUTOMAKE(libmthca, 1.0.4)
AM_PROG_LIBTOOL
AC_ARG_WITH([valgrind],
@@ -32,7 +32,6 @@ dnl Checks for header files.
AC_CHECK_HEADER(infiniband/driver.h, [],
AC_MSG_ERROR([<infiniband/driver.h> not found. libmthca requires libibverbs.]))
AC_HEADER_STDC
-AC_CHECK_HEADERS(sysfs/libsysfs.h)
AC_CHECK_HEADER(valgrind/memcheck.h, memcheck_ok=yes, memcheck_ok=no)
if test $want_valgrind = yes && test $memcheck_ok = no; then
@@ -44,14 +43,33 @@ AC_C_CONST
AC_CHECK_SIZEOF(long)
dnl Checks for library functions
-AC_CHECK_FUNCS(ibv_read_sysfs_file ibv_dontfork_range ibv_dofork_range)
+AC_CHECK_FUNCS(ibv_read_sysfs_file ibv_dontfork_range ibv_dofork_range \
+ ibv_register_driver)
+
+dnl Now check if for libibverbs 1.0 vs 1.1
+dummy=if$$
+cat <<IBV_VERSION > $dummy.c
+#include <infiniband/driver.h>
+IBV_DEVICE_LIBRARY_EXTENSION
+IBV_VERSION
+IBV_DEVICE_LIBRARY_EXTENSION=`$CC $CPPFLAGS -E $dummy.c 2> /dev/null | tail -1`
+rm -f $dummy.c
+AM_CONDITIONAL(HAVE_IBV_DEVICE_LIBRARY_EXTENSION,
+ test $IBV_DEVICE_LIBRARY_EXTENSION != IBV_DEVICE_LIBRARY_EXTENSION)
+AC_SUBST(IBV_DEVICE_LIBRARY_EXTENSION)
AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
[if test -n "`$LD --help < /dev/null 2>/dev/null | grep version-script`"; then
- MTHCA_VERSION_SCRIPT='-Wl,--version-script=$(srcdir)/src/mthca.map'
+ ac_cv_version_script=yes
else
- MTHCA_VERSION_SCRIPT=
+ ac_cv_version_script=no
fi])
+
+if test $ac_cv_version_script = yes; then
+ MTHCA_VERSION_SCRIPT='-Wl,--version-script=$(srcdir)/src/mthca.map'
+else
+ MTHCA_VERSION_SCRIPT=
+fi
AC_SUBST(MTHCA_VERSION_SCRIPT)
AC_CONFIG_FILES([Makefile libmthca.spec])
diff --git a/libmthca.spec b/libmthca.spec
index f844a9b..b981596 100644
--- a/libmthca.spec
+++ b/libmthca.spec
@@ -1,36 +1,32 @@
-# $Id: libmthca.spec.in 8694 2006-07-26 23:01:44Z roland $
-
-%define ver 1.0.3
-
Name: libmthca
-Version: 1.0.3
+Version: 1.0.4
Release: 1%{?dist}
Summary: Mellanox InfiniBand HCA Userspace Driver
Group: System Environment/Libraries
License: GPL/BSD
Url: http://openib.org/
-Source: http://openib.org/downloads/libmthca-1.0.3.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source: http://openib.org/downloads/libmthca-1.0.4.tar.gz
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: libibverbs-devel >= 1.0-0.5.rc7
+BuildRequires: libibverbs-devel >= 1.1-0.1.rc2
%description
libmthca provides a device-specific userspace driver for Mellanox HCAs
(MT23108 InfiniHost and MT25208 InfiniHost III Ex) for use with the
libibverbs library.
-%package devel
+%package devel-static
Summary: Development files for the libmthca driver
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
-%description devel
+%description devel-static
Static version of libmthca that may be linked directly to an
application, which may be useful for debugging.
%prep
-%setup -q -n %{name}-%{ver}
+%setup -q -n %{name}-1.0.4
%build
%configure
@@ -38,23 +34,31 @@ make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make DESTDIR=%{buildroot} install
# remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_libdir}/infiniband/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/libmthca.so
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%{_libdir}/infiniband/mthca.so
+%{_libdir}/libmthca-rdmav2.so
+%{_sysconfdir}/libibverbs.d/mthca.driver
%doc AUTHORS COPYING ChangeLog README
-%files devel
+%files devel-static
%defattr(-,root,root,-)
-%{_libdir}/infiniband/mthca.a
+%{_libdir}/libmthca.a
%changelog
+* Thu Nov 9 2006 Roland Dreier <rdreier at cisco.com> - 1.0.4-1
+- New upstream release
+- Depend on libibverbs 1.1, and package new library file names.
+- Spec file cleanups: remove unused ver macro, improve BuildRoot, move
+ static libraries into devel-static package, and don't use makeinstall
+ any more (all suggested by Doug Ledford <dledford at redhat.com>).
+
* Wed Jul 26 2006 Roland Dreier <rdreier at cisco.com> - 1.0.3-1
- New upstream release
diff --git a/libmthca.spec.in b/libmthca.spec.in
index f44e16c..6d15b9b 100644
--- a/libmthca.spec.in
+++ b/libmthca.spec.in
@@ -1,36 +1,32 @@
-# $Id: libmthca.spec.in 8694 2006-07-26 23:01:44Z roland $
-
-%define ver @VERSION@
-
Name: libmthca
-Version: 1.0.3
+Version: 1.0.4
Release: 1%{?dist}
Summary: Mellanox InfiniBand HCA Userspace Driver
Group: System Environment/Libraries
License: GPL/BSD
Url: http://openib.org/
-Source: http://openib.org/downloads/libmthca-1.0.3.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source: http://openib.org/downloads/libmthca-1.0.4.tar.gz
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: libibverbs-devel >= 1.0-0.5.rc7
+BuildRequires: libibverbs-devel >= 1.1-0.1.rc2
%description
libmthca provides a device-specific userspace driver for Mellanox HCAs
(MT23108 InfiniHost and MT25208 InfiniHost III Ex) for use with the
libibverbs library.
-%package devel
+%package devel-static
Summary: Development files for the libmthca driver
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
-%description devel
+%description devel-static
Static version of libmthca that may be linked directly to an
application, which may be useful for debugging.
%prep
-%setup -q -n %{name}-%{ver}
+%setup -q -n %{name}- at VERSION@
%build
%configure
@@ -38,23 +34,31 @@ make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make DESTDIR=%{buildroot} install
# remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_libdir}/infiniband/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/libmthca.so
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%{_libdir}/infiniband/mthca.so
+%{_libdir}/libmthca-rdmav2.so
+%{_sysconfdir}/libibverbs.d/mthca.driver
%doc AUTHORS COPYING ChangeLog README
-%files devel
+%files devel-static
%defattr(-,root,root,-)
-%{_libdir}/infiniband/mthca.a
+%{_libdir}/libmthca.a
%changelog
+* Thu Nov 9 2006 Roland Dreier <rdreier at cisco.com> - 1.0.4-1
+- New upstream release
+- Depend on libibverbs 1.1, and package new library file names.
+- Spec file cleanups: remove unused ver macro, improve BuildRoot, move
+ static libraries into devel-static package, and don't use makeinstall
+ any more (all suggested by Doug Ledford <dledford at redhat.com>).
+
* Wed Jul 26 2006 Roland Dreier <rdreier at cisco.com> - 1.0.3-1
- New upstream release
diff --git a/mthca.driver b/mthca.driver
new file mode 100644
index 0000000..5880a47
--- /dev/null
+++ b/mthca.driver
@@ -0,0 +1 @@
+driver mthca
diff --git a/src/ah.c b/src/ah.c
index 7dabdc0..d7494d5 100644
--- a/src/ah.c
+++ b/src/ah.c
@@ -28,8 +28,6 @@
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
- *
- * $Id: ah.c 8817 2006-08-03 16:46:09Z roland $
*/
#if HAVE_CONFIG_H
diff --git a/src/buf.c b/src/buf.c
index 0693a9d..6c1be4f 100644
--- a/src/buf.c
+++ b/src/buf.c
@@ -28,8 +28,6 @@
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
- *
- * $Id$
*/
#if HAVE_CONFIG_H
diff --git a/src/cq.c b/src/cq.c
index b891493..0aeb7a9 100644
--- a/src/cq.c
+++ b/src/cq.c
@@ -30,8 +30,6 @@
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
- *
- * $Id: cq.c 9864 2006-10-17 23:19:45Z roland $
*/
#if HAVE_CONFIG_H
diff --git a/src/doorbell.h b/src/doorbell.h
index 116bab2..a3aa42a 100644
--- a/src/doorbell.h
+++ b/src/doorbell.h
@@ -28,8 +28,6 @@
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
- *
- * $Id: doorbell.h 2166 2005-04-12 16:37:00Z roland $
*/
#ifndef DOORBELL_H
@@ -101,7 +99,7 @@ static inline void mthca_write_db_rec(uint32_t val[2], uint32_t *db)
{
*(volatile uint32_t *) db = val[0];
mb();
- *(volatile uint32_t *) (db + 1) = val[0];
+ *(volatile uint32_t *) (db + 1) = val[1];
}
#endif
diff --git a/src/memfree.c b/src/memfree.c
index 9144d20..987e149 100644
--- a/src/memfree.c
+++ b/src/memfree.c
@@ -28,8 +28,6 @@
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
- *
- * $Id: memfree.c 8817 2006-08-03 16:46:09Z roland $
*/
#if HAVE_CONFIG_H
diff --git a/src/mthca-abi.h b/src/mthca-abi.h
index 74d6744..2557274 100644
--- a/src/mthca-abi.h
+++ b/src/mthca-abi.h
@@ -29,8 +29,6 @@
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
- *
- * $Id: mthca-abi.h 5218 2006-01-30 22:32:43Z roland $
*/
#ifndef MTHCA_ABI_H
@@ -38,6 +36,8 @@
#include <infiniband/kern-abi.h>
+#define MTHCA_UVERBS_ABI_VERSION 1
+
struct mthca_alloc_ucontext_resp {
struct ibv_get_context_resp ibv_resp;
__u32 qp_tab_size;
diff --git a/src/mthca.c b/src/mthca.c
index 2ecb449..0f7e953 100644
--- a/src/mthca.c
+++ b/src/mthca.c
@@ -29,8 +29,6 @@
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
- *
- * $Id: mthca.c 7475 2006-05-24 16:25:02Z roland $
*/
#if HAVE_CONFIG_H
@@ -45,7 +43,7 @@
#include <pthread.h>
#include <string.h>
-#ifdef HAVE_SYSFS_LIBSYSFS_H
+#ifndef HAVE_IBV_REGISTER_DRIVER
#include <sysfs/libsysfs.h>
#endif
@@ -258,8 +256,8 @@ static int ibv_read_sysfs_file(const char *dir, const char *file,
}
#endif /* HAVE_IBV_READ_SYSFS_FILE */
-struct ibv_device *ibv_driver_init(const char *uverbs_sys_path,
- int abi_version)
+static struct ibv_device *mthca_driver_init(const char *uverbs_sys_path,
+ int abi_version)
{
char value[8];
struct mthca_device *dev;
@@ -284,6 +282,12 @@ struct ibv_device *ibv_driver_init(const char *uverbs_sys_path,
return NULL;
found:
+ if (abi_version > MTHCA_UVERBS_ABI_VERSION) {
+ fprintf(stderr, PFX "Fatal: ABI version %d of %s is too new (expected %d)\n",
+ abi_version, uverbs_sys_path, MTHCA_UVERBS_ABI_VERSION);
+ return NULL;
+ }
+
dev = malloc(sizeof *dev);
if (!dev) {
fprintf(stderr, PFX "Fatal: couldn't allocate device for %s\n",
@@ -298,15 +302,16 @@ found:
return &dev->ibv_dev;
}
+#ifdef HAVE_IBV_REGISTER_DRIVER
+static __attribute__((constructor)) void mthca_register_driver(void)
+{
+ ibv_register_driver("mthca", mthca_driver_init);
+}
+#else
/*
* Export the old libsysfs sysfs_class_device-based driver entry point
- * if libsysfs headers are installed. It doesn't hurt to export it,
- * even if libibverbs is new enough not to use it; but if libsysfs
- * headers are not installed, we can assume that the version of
- * libibverbs we are building against is new enough not to use
- * openib_driver_init().
+ * if libibverbs does not export an ibv_register_driver() function.
*/
-#ifdef HAVE_SYSFS_LIBSYSFS_H
struct ibv_device *openib_driver_init(struct sysfs_class_device *sysdev)
{
int abi_ver = 0;
@@ -316,6 +321,6 @@ struct ibv_device *openib_driver_init(struct sysfs_class_device *sysdev)
value, sizeof value) > 0)
abi_ver = strtol(value, NULL, 10);
- return ibv_driver_init(sysdev->path, abi_ver);
+ return mthca_driver_init(sysdev->path, abi_ver);
}
-#endif /* HAVE_SYSFS_LIBSYSFS_H */
+#endif /* HAVE_IBV_REGISTER_DRIVER */
diff --git a/src/mthca.h b/src/mthca.h
index da261ff..1f31bc3 100644
--- a/src/mthca.h
+++ b/src/mthca.h
@@ -29,8 +29,6 @@
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
- *
- * $Id: mthca.h 9864 2006-10-17 23:19:45Z roland $
*/
#ifndef MTHCA_H
diff --git a/src/qp.c b/src/qp.c
index d90a9b1..f2483e9 100644
--- a/src/qp.c
+++ b/src/qp.c
@@ -29,8 +29,6 @@
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
- *
- * $Id: qp.c 10040 2006-11-02 18:34:47Z roland $
*/
#if HAVE_CONFIG_H
@@ -663,7 +661,7 @@ int mthca_arbel_post_send(struct ibv_qp *ibqp, struct ibv_send_wr *wr,
((struct mthca_next_seg *) prev_wqe)->ee_nds =
htonl(MTHCA_NEXT_DBD | size |
((wr->send_flags & IBV_SEND_FENCE) ?
- MTHCA_NEXT_FENCE : 0));
+ MTHCA_NEXT_FENCE : 0));
if (!size0) {
size0 = size;
@@ -847,7 +845,7 @@ int mthca_alloc_qp_buf(struct ibv_pd *pd, struct ibv_qp_cap *cap,
qp->buf_size = qp->send_wqe_offset + (qp->sq.max << qp->sq.wqe_shift);
- if (mthca_alloc_buf(&qp->buf,
+ if (mthca_alloc_buf(&qp->buf,
align(qp->buf_size, to_mdev(pd->context->device)->page_size),
to_mdev(pd->context->device)->page_size)) {
free(qp->wrid);
diff --git a/src/srq.c b/src/srq.c
index 75c0c4f..f9fc006 100644
--- a/src/srq.c
+++ b/src/srq.c
@@ -28,8 +28,6 @@
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
- *
- * $Id: srq.c 9864 2006-10-17 23:19:45Z roland $
*/
#if HAVE_CONFIG_H
diff --git a/src/verbs.c b/src/verbs.c
index 6791724..ef1b52c 100644
--- a/src/verbs.c
+++ b/src/verbs.c
@@ -29,8 +29,6 @@
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
- *
- * $Id: verbs.c 9722 2006-10-04 23:57:10Z roland $
*/
#if HAVE_CONFIG_H
@@ -123,13 +121,24 @@ static struct ibv_mr *__mthca_reg_mr(struct ibv_pd *pd, void *addr,
{
struct ibv_mr *mr;
struct ibv_reg_mr cmd;
+ int ret;
mr = malloc(sizeof *mr);
if (!mr)
return NULL;
- if (ibv_cmd_reg_mr(pd, addr, length, hca_va,
- access, mr, &cmd, sizeof cmd)) {
+#ifdef IBV_CMD_REG_MR_HAS_RESP_PARAMS
+ {
+ struct ibv_reg_mr_resp resp;
+
+ ret = ibv_cmd_reg_mr(pd, addr, length, hca_va, access, mr,
+ &cmd, sizeof cmd, &resp, sizeof resp);
+ }
+#else
+ ret = ibv_cmd_reg_mr(pd, addr, length, hca_va, access, mr,
+ &cmd, sizeof cmd);
+#endif
+ if (ret) {
free(mr);
return NULL;
}
@@ -540,7 +549,7 @@ struct ibv_qp *mthca_create_qp(struct ibv_pd *pd, struct ibv_qp_init_attr *attr)
} else {
cmd.sq_db_page = cmd.rq_db_page =
cmd.sq_db_index = cmd.rq_db_index = 0;
- }
+ }
ret = ibv_cmd_create_qp(pd, &qp->ibv_qp, attr, &cmd.ibv_cmd, sizeof cmd,
&resp, sizeof resp);
diff --git a/src/wqe.h b/src/wqe.h
index 1d9900d..602f512 100644
--- a/src/wqe.h
+++ b/src/wqe.h
@@ -29,8 +29,6 @@
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
- *
- * $Id: wqe.h 4214 2005-11-29 17:43:08Z roland $
*/
#ifndef WQE_H
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/libmthca.git
More information about the Pkg-ofed-commits
mailing list