17330177 Problem with library/perl-5/authen-pam in s11.2 build 21 s11-update
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Mon, 26 Aug 2013 13:52:51 -0700
branchs11-update
changeset 2750 a5a242fc4acc
parent 2745 c2e0dae26655
child 2751 7addff69eee6
17330177 Problem with library/perl-5/authen-pam in s11.2 build 21
components/perl_modules/authen-pam/Makefile
components/perl_modules/authen-pam/authen-pam-GENFRAG.p5m
components/perl_modules/authen-pam/resolve.deps
--- a/components/perl_modules/authen-pam/Makefile	Mon Aug 26 11:48:53 2013 -0700
+++ b/components/perl_modules/authen-pam/Makefile	Mon Aug 26 13:52:51 2013 -0700
@@ -34,9 +34,8 @@
 COMPONENT_PROJECT_URL=	http://search.cpan.org/~nikip/
 COMPONENT_BUGDB=	perl-mod/authen-pam
 
-# don't build this module against perl 5.8.4
 # build threaded 5.12 support too
-PERL_VERSIONS = 5.12 5.12-mt
+PERL_VERSIONS += 5.12-mt
 
 include $(WS_TOP)/make-rules/prep.mk
 include $(WS_TOP)/make-rules/ips.mk
--- a/components/perl_modules/authen-pam/authen-pam-GENFRAG.p5m	Mon Aug 26 11:48:53 2013 -0700
+++ b/components/perl_modules/authen-pam/authen-pam-GENFRAG.p5m	Mon Aug 26 13:52:51 2013 -0700
@@ -29,3 +29,7 @@
 depend type=optional fmri=consolidation/desktop/[email protected]
 
 depend fmri=library/perl-5/authen-pam-threaded-512 predicate=runtime/perl-threaded-512 type=conditional
+
+# force the perl version agnostic package to component version 5.8.4 because the
+# desktop delivered it at that version instead of the component version
+<transform set name=pkg.fmri value=(pkg:/library/perl-5/authen-pam)@$(IPS_COMPONENT_VERSION),($(BUILD_VERSION)$) -> set value %<1>@5.8.4,%<2> > 
--- a/components/perl_modules/authen-pam/resolve.deps	Mon Aug 26 11:48:53 2013 -0700
+++ b/components/perl_modules/authen-pam/resolve.deps	Mon Aug 26 13:52:51 2013 -0700
@@ -1,3 +1,4 @@
+runtime/perl-584
 runtime/perl-512
 runtime/perl-516
 runtime/perl-threaded-512