13864 want 64bit libipmp

Reviewed by: Andy Fiddaman <andy@omnios.org>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>

4 files changed, 57 insertions, 1 deletions

diff --git a/usr/src/lib/libipmp/Makefile b/usr/src/lib/libipmp/Makefile
index d15db5b218..0ff0ce78a5 100644
--- a/usr/src/lib/libipmp/Makefile
+++ b/usr/src/lib/libipmp/Makefile
@@ -22,17 +22,33 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2021 Tintri by DDN, Inc.  All rights reserved.
+#
 
 include $(SRC)/lib/Makefile.lib
 
 HDRS =		ipmp.h ipmp_admin.h ipmp_mpathd.h ipmp_query.h ipmp_query_impl.h
 HDRDIR =	common
 SUBDIRS	=	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 POFILE =	libipmp.po
 MSGFILES =	common/ipmp.c
 XGETFLAGS =	-a
 
+TYPECHECK_LIB =	libipmp.so.1
+TYPELIST = \
+	ipmp_addrinfo_t \
+	ipmp_addrlist_t \
+	ipmp_groupinfo_xfer_t \
+	ipmp_grouplist_t \
+	ipmp_ifinfo_xfer_t \
+	ipmp_iflist_t \
+	ipmp_infotype_t \
+	ipmp_targinfo_xfer_t \
+	mi_query_t \
+	mi_result_t
+
 all :=		TARGET = all
 clean :=	TARGET = clean
 clobber :=	TARGET = clobber
@@ -44,7 +60,7 @@ all clean clobber install: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
-check:		$(CHECKHDRS)
+check:		$(CHECKHDRS) $(TYPECHECK)
 
 $(POFILE):	$(MSGFILES)
 		$(BUILDPO.msgfiles)
diff --git a/usr/src/lib/libipmp/amd64/Makefile b/usr/src/lib/libipmp/amd64/Makefile
new file mode 100644
index 0000000000..32e4b412a0
--- /dev/null
+++ b/usr/src/lib/libipmp/amd64/Makefile
@@ -0,0 +1,19 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2021, Tintri by DDN. All rights reserved.
+#
+
+include ../Makefile.com
+include ../../Makefile.lib.64
+
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/libipmp/sparcv9/Makefile b/usr/src/lib/libipmp/sparcv9/Makefile
new file mode 100644
index 0000000000..32e4b412a0
--- /dev/null
+++ b/usr/src/lib/libipmp/sparcv9/Makefile
@@ -0,0 +1,19 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2021, Tintri by DDN. All rights reserved.
+#
+
+include ../Makefile.com
+include ../../Makefile.lib.64
+
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/pkg/manifests/system-library.mf b/usr/src/pkg/manifests/system-library.mf
index 4b3acde4aa..f5a0640ecf 100644
--- a/usr/src/pkg/manifests/system-library.mf
+++ b/usr/src/pkg/manifests/system-library.mf
@@ -211,6 +211,7 @@ file path=lib/$(ARCH64)/libgen.so.1
 file path=lib/$(ARCH64)/libinetutil.so.1
 file path=lib/$(ARCH64)/libintl.so.1
 file path=lib/$(ARCH64)/libipadm.so.1
+file path=lib/$(ARCH64)/libipmp.so.1
 file path=lib/$(ARCH64)/libkmf.so.1
 file path=lib/$(ARCH64)/libkmfberder.so.1
 file path=lib/$(ARCH64)/libkstat.so.1
@@ -633,6 +634,7 @@ link path=lib/$(ARCH64)/libelf.so target=libelf.so.1
 $(i386_ONLY)link path=lib/$(ARCH64)/libfdisk.so target=libfdisk.so.1
 link path=lib/$(ARCH64)/libgen.so target=libgen.so.1
 link path=lib/$(ARCH64)/libintl.so target=libintl.so.1
+link path=lib/$(ARCH64)/libipmp.so target=libipmp.so.1
 link path=lib/$(ARCH64)/libkmf.so target=libkmf.so.1
 link path=lib/$(ARCH64)/libkmfberder.so target=libkmfberder.so.1
 link path=lib/$(ARCH64)/libkstat.so target=libkstat.so.1