22992910 pep8 needs bypass on S11 but not S12
authorJohn Beck <John.Beck@Oracle.COM>
Mon, 28 Mar 2016 14:01:43 -0700
changeset 5661 69b9e8724bb3
parent 5660 21cf5207d6b8
child 5662 e2e244713941
22992910 pep8 needs bypass on S11 but not S12
components/python/pep8/pep8-PYVER.p5m
make-rules/ips.mk
--- a/components/python/pep8/pep8-PYVER.p5m	Mon Mar 28 15:41:54 2016 -0700
+++ b/components/python/pep8/pep8-PYVER.p5m	Mon Mar 28 14:01:43 2016 -0700
@@ -22,6 +22,7 @@
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+$(SOLARIS_11_ONLY)<transform file path=usr/lib/python$(PYVER)/vendor-packages/pep8.py -> add pkg.depend.bypass-generate .*/time.* >
 #
 set name=pkg.fmri \
     value=pkg:/library/python/pep8-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/make-rules/ips.mk	Mon Mar 28 15:41:54 2016 -0700
+++ b/make-rules/ips.mk	Mon Mar 28 14:01:43 2016 -0700
@@ -248,6 +248,7 @@
 	$(PKGFMT) $(PKGFMT_CHECK_ARGS) $(CANONICAL_MANIFESTS)
 	$(PKGMOGRIFY) -D PYVER=$(1) -D MAYBE_PYVER_SPACE="$(1) " \
 		-D MAYBE_SPACE_PYVER=" $(1)" \
+		-D SOLARIS_11_ONLY="$(SOLARIS_11_ONLY)" \
 		-D PYV=$(shell echo $(1) | tr -d .) $$< > [email protected]
 endef
 $(foreach ver,$(PYTHON_VERSIONS),$(eval $(call python-manifest-rule,$(ver))))
@@ -273,6 +274,7 @@
 $(MANIFEST_BASE)-%.p5m: %-PYVER.p5m $(BUILD_DIR)/mkgeneric-python
 	$(PKGFMT) $(PKGFMT_CHECK_ARGS) $(CANONICAL_MANIFESTS)
 	$(PKGMOGRIFY) -D PYV=###PYV### -D MAYBE_PYVER_SPACE= \
+		-D SOLARIS_11_ONLY="$(SOLARIS_11_ONLY)" \
 		-D MAYBE_SPACE_PYVER= $(BUILD_DIR)/mkgeneric-python \
 		$(WS_TOP)/transforms/mkgeneric $< > [email protected]
 	if [ -f $*-GENFRAG.p5m ]; then cat $*-GENFRAG.p5m >> [email protected]; fi