# HG changeset patch
# User Craig Mohrman <craig.mohrman@oracle.com>
# Date 1459288939 25200
# Node ID 46773d0b48058a67402edb12513579004f8fc0aa
# Parent  a5c5f8ac5f4b7012cd99f2587b2e0b15155ea1ac
23018803 perl changes in 22970244 broke open fabrics perl commands

diff -r a5c5f8ac5f4b -r 46773d0b4805 components/open-fabrics/Makefile
--- a/components/open-fabrics/Makefile	Tue Mar 29 14:45:36 2016 -0700
+++ b/components/open-fabrics/Makefile	Tue Mar 29 15:02:19 2016 -0700
@@ -108,7 +108,8 @@
 
 FORCE:
 
-REQUIRED_PACKAGES += runtime/perl-522
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += runtime/tcl-8
 REQUIRED_PACKAGES += shell/bash
 REQUIRED_PACKAGES += shell/ksh93
diff -r a5c5f8ac5f4b -r 46773d0b4805 components/open-fabrics/infiniband-diags/Makefile
--- a/components/open-fabrics/infiniband-diags/Makefile	Tue Mar 29 14:45:36 2016 -0700
+++ b/components/open-fabrics/infiniband-diags/Makefile	Tue Mar 29 15:02:19 2016 -0700
@@ -47,9 +47,9 @@
 COMPONENT_PREP_ACTION = \
         cp solaris_set_nodedesc.c $(@D)/src
 
-COMPONENT_INSTALL_ENV +=	PERL=$(PERL)
+COMPONENT_INSTALL_ENV +=	PERL=$(PERL.5.12)
 
-CONFIGURE_ENV +=	PERL=$(PERL)
+CONFIGURE_ENV +=	PERL=$(PERL.5.12)
 
 CONFIGURE_OPTIONS +=	--sbindir=$(USRSBINDIR)
 
diff -r a5c5f8ac5f4b -r 46773d0b4805 components/open-fabrics/open-fabrics.p5m
--- a/components/open-fabrics/open-fabrics.p5m	Tue Mar 29 14:45:36 2016 -0700
+++ b/components/open-fabrics/open-fabrics.p5m	Tue Mar 29 15:02:19 2016 -0700
@@ -183,8 +183,12 @@
 link path=usr/lib/secure/libsdp.so target=libsdp.so.1.0.0
 link path=usr/lib/secure/libsdp.so.1 target=libsdp.so.1.0.0
 file path=usr/lib/secure/libsdp.so.1.0.0
-file path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/IBswcountlimits.pm \
+dir  path=usr/perl5/site_perl/5.12/i86pc-solaris-64int variant.arch=i386
+file path=usr/perl5/site_perl/5.12/i86pc-solaris-64int/IBswcountlimits.pm \
     group=root mode=0444 variant.arch=i386
+dir  path=usr/perl5/site_perl/5.12/sun4-solaris-64int variant.arch=sparc
+file path=usr/perl5/site_perl/5.12/sun4-solaris-64int/IBswcountlimits.pm \
+    group=root mode=0444 variant.arch=sparc
 dir  path=usr/sbin
 file path=usr/sbin/dump2psl.pl
 file path=usr/sbin/dump2slvl.pl