Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/open-fabrics/libsif/patches/001-libsif-config.patch
branchs11u3-sru
changeset 6322 c8b38df3868d
parent 5812 ac16f94826c3 
--- a/components/open-fabrics/libsif/patches/001-libsif-config.patch	Tue Jun 28 09:40:07 2016 -0700
+++ b/components/open-fabrics/libsif/patches/001-libsif-config.patch	Fri Jul 01 13:38:15 2016 -0700
@@ -1,9 +1,10 @@
 # This patch does the config changes specific to solaris.
 # It is developed By solaris PSIF team. We plan to have a common upstream repo
 # and submit these changes to it, but do not yet have a target date of doing it.
-diff -r 1584d5cbb44d Makefile.am
---- a/Makefile.am	Wed Feb 10 12:40:22 2016 +0530
-+++ b/Makefile.am	Wed Mar 09 22:32:13 2016 +0530
+
+diff -r f33c4fca4fc4 Makefile.am
+--- a/Makefile.am	Wed Apr 27 20:44:59 2016 -0700
++++ b/Makefile.am	Thu Apr 28 05:19:35 2016 -0700
 @@ -9,7 +9,11 @@
    -avoid-version \
    -release @IBV_DEVICE_LIBRARY_EXTENSION@
@@ -17,19 +18,17 @@
  src_libsif_la_SOURCES = \
      src/cpu_features.c \
      src/cq.c \
-@@ -24,14 +28,20 @@
+@@ -24,14 +28,18 @@
  
  src_libsif_la_LDFLAGS = $(SIF_LDFLAGS) $(sif_version_script)
  
-+if SIF_SOLARIS
-+sifconfdir = $(datadir)/libibverbs.d
-+else
++if !SIF_SOLARIS
  src_libsifwa_la_SOURCES = src/sif_eps.c
  src_libsifwa_la_CFLAGS = $(AM_CFLAGS) $(NETLINK_CFLAGS)
  src_libsifwa_la_LDFLAGS = $(SIF_LDFLAGS) $(NETLINK_LIBS) $(sifwa_version_script)
++endif
  
  sifconfdir = $(sysconfdir)/libibverbs.d
-+endif
  sifconf_DATA = sif.driver
  
 +if !SIF_SOLARIS
@@ -38,7 +37,7 @@
  
  EXTRA_DIST = \
      libsif.spec.in \
-@@ -67,8 +77,10 @@
+@@ -67,8 +75,10 @@
      src/psif_hw_print.c
  
  libsif_includedir = $(includedir)/infiniband
@@ -51,9 +50,9 @@
  
  dist-hook:
  	@rm -f $(distdir)/m4/{sifdrv,psifapi}.m4
-diff -r 1584d5cbb44d configure.ac
---- a/configure.ac	Wed Feb 10 12:40:22 2016 +0530
-+++ b/configure.ac	Wed Mar 09 22:32:13 2016 +0530
+diff -r f33c4fca4fc4 configure.ac
+--- a/configure.ac	Wed Apr 27 20:44:59 2016 -0700
++++ b/configure.ac	Thu Apr 28 05:19:35 2016 -0700
 @@ -10,6 +10,10 @@
  # Silent rules by default - use make V=1 for verbose
  AM_SILENT_RULES([yes])
@@ -100,7 +99,7 @@
  dnl Now check if for libibverbs version:
  dummy=if$$
  cat <<IBV_VERSION > $dummy.c
-@@ -86,11 +89,34 @@
+@@ -86,11 +89,22 @@
  AC_SUBST(IBV_DEVICE_LIBRARY_EXTENSION)
  
  SIF_GET_CONTEXT_CONTAINER="return container_of(ibctx, struct sif_context, ibv_ctx);"
@@ -108,26 +107,14 @@
 +SIF_GET_SRQ_CONTAINER="return container_of(ibsrq, struct sif_rq, ibv_srq);"
 +SIF_GET_STRUCT="ibv"
  
--AM_CONDITIONAL([HAVE_VERBS_REGISTER_DRIVER],dnl
-+if test $os_type = Linux; then
-+    AM_CONDITIONAL([HAVE_VERBS_REGISTER_DRIVER],dnl
- 	[SIF_GET_CONTEXT_CONTAINER="return container_of(ibctx, struct sif_context, verbs_ctx.context);"])
-+    AM_CONDITIONAL([HAVE_VERBS_REGISTER_DRIVER],dnl
-+        [SIF_GET_QP_CONTAINER="return container_of(ibqp, struct sif_qp, verbs_qp.qp);"])
-+    AM_CONDITIONAL([HAVE_VERBS_REGISTER_DRIVER],dnl
-+        [SIF_GET_SRQ_CONTAINER="return container_of(ibsrq, struct sif_rq, verbs_srq.srq);"])
-+    AM_CONDITIONAL([HAVE_VERBS_REGISTER_DRIVER], [SIF_GET_STRUCT="verbs"])
-+fi
-+
-+if test $os_type = SunOS ; then
-+    AM_CONDITIONAL([HAVE_VERBS_REGISTER_DRIVER],dnl
-+        [SIF_GET_CONTEXT_CONTAINER="return container_of(ibctx, struct sif_context, ibv_ctx);"])
-+    AM_CONDITIONAL([HAVE_VERBS_REGISTER_DRIVER],dnl
-+        [SIF_GET_QP_CONTAINER="return container_of(ibqp, struct sif_qp, ibv_qp);"])
-+    AM_CONDITIONAL([HAVE_VERBS_REGISTER_DRIVER],dnl
-+        [SIF_GET_SRQ_CONTAINER="return container_of(ibsrq, struct sif_rq, ibv_srq);"])
-+    AM_CONDITIONAL([HAVE_VERBS_REGISTER_DRIVER], [SIF_GET_STRUCT="ibv"])
-+fi
+ AM_CONDITIONAL([HAVE_VERBS_REGISTER_DRIVER],dnl
+-	[SIF_GET_CONTEXT_CONTAINER="return container_of(ibctx, struct sif_context, verbs_ctx.context);"])
++    [SIF_GET_CONTEXT_CONTAINER="return container_of(ibctx, struct sif_context, verbs_ctx.context);"])
++AM_CONDITIONAL([HAVE_VERBS_REGISTER_DRIVER],dnl
++    [SIF_GET_QP_CONTAINER="return container_of(ibqp, struct sif_qp, verbs_qp.qp);"])
++AM_CONDITIONAL([HAVE_VERBS_REGISTER_DRIVER],dnl
++    [SIF_GET_SRQ_CONTAINER="return container_of(ibsrq, struct sif_rq, verbs_srq.srq);"])
++AM_CONDITIONAL([HAVE_VERBS_REGISTER_DRIVER], [SIF_GET_STRUCT="verbs"])
  
  AC_SUBST([SIF_GET_CONTEXT_CONTAINER])
 +AC_SUBST([SIF_GET_STRUCT])
@@ -136,9 +123,9 @@
  
  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
-diff -r 1584d5cbb44d sif.driver
---- a/sif.driver	Wed Feb 10 12:40:22 2016 +0530
-+++ b/sif.driver	Wed Mar 09 22:32:13 2016 +0530
+diff -r f33c4fca4fc4 sif.driver
+--- a/sif.driver	Wed Apr 27 20:44:59 2016 -0700
++++ b/sif.driver	Thu Apr 28 05:19:35 2016 -0700
 @@ -1,1 +1,6 @@
 +#
 +# Copyright (c) 2014, 2016, Oracle America, Inc. and its Affiliates
upstream/oracle/userland-gate