--- a/components/open-fabrics/libibverbs/Makefile	Sun Feb 05 14:39:15 2017 -0800
+++ b/components/open-fabrics/libibverbs/Makefile	Mon Feb 06 13:02:58 2017 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 BUILD_BITS= 64
 include ../ofed-component-macros.mk
@@ -42,6 +42,7 @@
 		ibv_register_sm_events.3
 
 include $(WS_MAKE_RULES)/shared-targets.mk
+include $(WS_MAKE_RULES)/lint-libraries.mk
 
 # add flags to get at extra bits from other components' source trees
 CPPFLAGS +=	-I$(PWD)/../libmlx4/libmlx4-1.0.6/src
@@ -60,6 +61,12 @@
 	cd ../libmlx4; gmake prep; \
 	cd ../librdmacm; gmake prep
 
+# Userland lint-install code (lint-libraries.mk) would install llib-libverbs.ln
+# to the directory 'build/prototype/$(MACH)/usr/lib/$(MACH64)',
+# which doesn't exist and must be created manually to let the installation pass.
+COMPONENT_PRE_INSTALL_ACTION = \
+        $(MKDIR) $(BUILD_DIR)/prototype/$(MACH)/usr/lib/$(MACH64)
+
 COMPONENT_POST_INSTALL_ACTION = \
 	$(RM) $(PROTO_DIR)/$(CONFIGURE_BINDIR.$(BITS))/ibv_uc_pingpong; \
 	$(RM) $(PROTOUSRSHAREMAN1DIR)/ibv_uc_pingpong.1 \
@@ -70,7 +77,8 @@
 	$(PROTOUSRSHAREMAN3DIR)/ibv_unreg_xrc_rcv_qp.3 \
 	$(PROTOUSRSHAREMAN3DIR)/ibv_query_xrc_rcv_qp.3 \
 	$(PROTOUSRSHAREMAN3DIR)/ibv_create_xrc_rcv_qp.3 \
-	$(PROTOUSRSHAREMAN3DIR)/ibv_modify_xrc_rcv_qp.3
+	$(PROTOUSRSHAREMAN3DIR)/ibv_modify_xrc_rcv_qp.3; \
+	$(INSTALL) -c llib-libverbs $(PROTOUSRLIBDIR)/llib-libverbs
 
 install:	$(INSTALL_64) $(PROTOMAN3FILES)
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/open-fabrics/libibverbs/llib-libverbs	Mon Feb 06 13:02:58 2017 -0800
@@ -0,0 +1,29 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+
+/* LINTLIBRARY */
+/* PROTOLIB1 */
+
+#include <infiniband/verbs.h>

--- a/components/open-fabrics/open-fabrics.p5m	Sun Feb 05 14:39:15 2017 -0800
+++ b/components/open-fabrics/open-fabrics.p5m	Mon Feb 06 13:02:58 2017 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability "pass-through volatile">
 set name=pkg.fmri \
@@ -173,6 +173,8 @@
 file path=usr/lib/$(MACH64)/librdmacm.so.1.0.0
 file path=usr/lib/$(MACH64)/libsif-rdmav2.so
 link path=usr/lib/$(MACH64)/libsif.so target=libsif-rdmav2.so
+file path=usr/lib/$(MACH64)/llib-libverbs.ln
+file path=usr/lib/llib-libverbs
 link path=usr/lib/secure/$(MACH64)/libsdp.so target=libsdp.so.1.0.0
 link path=usr/lib/secure/$(MACH64)/libsdp.so.1 target=libsdp.so.1.0.0
 file path=usr/lib/secure/$(MACH64)/libsdp.so.1.0.0