# HG changeset patch # User Norm Jacobs # Date 1424048529 21600 # Node ID 30b42c38bbc41edf9b01909cdcf2df48009eccd3 # Parent 60344306d22308e98bce968114b3998fb9baff1b 15786608 SUNBT7162754 create new meta package developer/opensolaris/userland diff -r 60344306d223 -r 30b42c38bbc4 components/Makefile --- a/components/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -31,23 +31,43 @@ # components.mk is auto-generated by the build tools. It populates the # COMPONENT_DIRS macro with a list of all directories in the workspace that # contain a component. -components.mk: # Makefile # $(WS_TOP)/components +$(WS_MACH)/components.mk: $(WS_MACH) # Makefile # $(WS_TOP)/components @echo "Generating component list..." @$(BASS_O_MATIC) --workspace=$(WS_TOP) --components=paths \ | sed -e 's;^$(shell pwd)/;COMPONENT_DIRS += ;g' >$@ --include components.mk +-include $(WS_MACH)/components.mk # depends.mk is auto-generated by concatenating 'depend.mk' files in each # component directory. -depends.mk: components.mk +$(WS_MACH)/depends.mk: $(WS_MACH)/components.mk @echo "Generating component dependencies..." @cat $(shell $(BASS_O_MATIC) --workspace=$(WS_TOP) --components=paths \ | sed -e 's;^$(shell pwd)/;;g' -e 's;$$;/depend.mk;g') >$@ \ 2>/dev/null --include depends.mk +-include $(WS_MACH)/depends.mk +# +# Walk through all of the components echoing the REQUIRED_PACKAGES for each one. +# Pass all output through sed to drop lines with whitespace between words, +# remove whitespace from lines, drop empty lines, and REQUIRED_PACKAGES += +# to the lines. Pass that through sort -u +# +$(WS_MACH)/requires.mk: $(WS_MACH) + @echo "Generating list of required packages to build consolidation..." + @$(GMAKE) component-hook \ + COMPONENT_HOOK='@echo $$(REQUIRED_PACKAGES:%="%\\n")' | \ + $(GSED) -e '/\S\s\S/d' -e 's/^ //g' -e '/^\s*$$/d' \ + -e 's/^/REQUIRED_PACKAGES += /' | \ + sort -u >$(@) + +system-check:: $(WS_MACH)/requires.mk + @$(GMAKE) -f $(WS_MAKE_RULES)/environment.mk -f $< component-environment-check + +system-prep:: $(WS_MACH)/requires.mk + @echo "Installing any missing packages..." + @$(GMAKE) -f $(WS_MAKE_RULES)/environment.mk -f $< component-environment-prep download: TARGET = download prep: TARGET = prep @@ -57,9 +77,9 @@ clean: TARGET = clean clobber: TARGET = clobber test: TARGET = test +zone-build: TARGET = component-zone-build component-hook: TARGET = component-hook -prep build install publish test: TEMPLATE_ZONE=$(ZONE) -prep build install publish test: LOG = >$(WS_LOGS)/$(@F).$(TARGET).log 2>&1 +zone-build prep build install publish test: LOG = >$(WS_LOGS)/$(@F).$(TARGET).log 2>&1 # turn off pkglint for the individual component builds. ifeq ($(strip $(PKGLINT_COMPONENT)),) @@ -77,25 +97,27 @@ .DEFAULT: publish -build install publish test: $(COMPONENT_DIRS) +zone-build build install publish test: $(COMPONENT_DIRS) COMPONENT_DIRS.nosetup = $(COMPONENT_DIRS:%=%.nosetup) -download prep: $(COMPONENT_DIRS.nosetup) - +download:: $(COMPONENT_DIRS.nosetup) +prep: $(COMPONENT_DIRS.nosetup) +component-environment-check:: $(COMPONENT_DIRS.nosetup) component-hook: $(COMPONENT_DIRS.nosetup) clean: $(COMPONENT_DIRS.nosetup) - $(RM) components.mk depends.mk .profile + $(RM) $(WS_MACH)/components.mk $(WS_MACH)/depends.mk \ + $(WS_MACH)/requires.mk $(WS_MACH)/*.p5m clobber: $(COMPONENT_DIRS.nosetup) clean @cd ../tools ; echo "clobbering tools..." ; $(GMAKE) clobber $(RM) -r $(WS_REPO) $(WS_LOGS) $(WS_LINT_CACHE) -setup: $(WS_LOGS) $(WS_REPO) tools $(WS_LINT_CACHE) +setup: $(WS_MACH) $(WS_LOGS) $(WS_REPO) tools $(WS_LINT_CACHE) -$(WS_LOGS): +$(WS_MACH) $(WS_LOGS): $(MKDIR) $@ $(WS_REPO): @@ -124,17 +146,9 @@ tools: @cd ../tools ; echo "building tools..." ; $(GMAKE) clean setup -# $(WS_COMPONENTS) is the home directory for the zone user, so create a profile -# to pass a few things on to zone based builds -.profile: - echo "PATH=$(PATH)" >>$@ - echo "WS_TOP=$(WS_TOP)" >>$@ - echo "export PATH WS_TOP" >>$@ - $(COMPONENT_DIRS): $(WS_LOGS) setup FORCE @cd $@ && echo "$(TARGET) $@" && \ - $(BASS_O_MATIC) $(TEMPLATE_ZONE:%=--template-zone %) \ - $(@:%=--component %) --make $(TARGET) $(LOG) + $(BASS_O_MATIC) $(@:%=--component %) --make $(TARGET) $(LOG) # Turn userland-incorporator warnings into build failures INCORPORATE_WERROR ?= --Werror @@ -143,8 +157,8 @@ $(PKGREPO) refresh -s $(PKG_REPO) $(WS_TOOLS)/userland-incorporator --repository $(PKG_REPO) \ --version=0.$(OS_VERSION),$(BUILD_VERSION) -p $(PUBLISHER) \ - -c $(CONSOLIDATION) --destdir=$(WS_LOGS) $(INCORPORATE_WERROR) - for incorporation in $(WS_LOGS)/*.p5m ; do \ + -c $(CONSOLIDATION) --destdir=$(WS_MACH) $(INCORPORATE_WERROR) + for incorporation in $(WS_MACH)/*.p5m ; do \ $(PKGSEND) -s $(PKG_REPO) publish --fmri-in-manifest \ $${incorporation} ; \ done @@ -163,7 +177,6 @@ $(COMPONENT_DIRS.nosetup): $(WS_LOGS) FORCE @cd $(@:%.nosetup=%) && echo "$(TARGET) $(@:%.nosetup=%)" && \ - $(BASS_O_MATIC) $(TEMPLATE_ZONE:%=--template-zone %) \ - $(@:%.nosetup=--component %) --make $(TARGET) $(LOG) + $(BASS_O_MATIC) $(@:%.nosetup=--component %) --make $(TARGET) $(LOG) FORCE: diff -r 60344306d223 -r 30b42c38bbc4 components/a2ps/Makefile --- a/components/a2ps/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/a2ps/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 4517 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # don't use LD_Z_IGNORE: causes linker problems LD_Z_IGNORE= @@ -75,6 +75,11 @@ test: $(TEST_32) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += developer/gperf +REQUIRED_PACKAGES += editor/gnu-emacs +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/perl-516 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/a2ps/resolve.deps --- a/components/a2ps/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -runtime/perl-512 -runtime/perl-516 -shell/ksh93 -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/aalib/Makefile --- a/components/aalib/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/aalib/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -39,10 +39,12 @@ TPNO= 6118 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk + +LINT_FLAGS += -I$(SOURCE_DIR)/src PKG_PROTO_DIRS += $(COMPONENT_SRC) @@ -82,6 +84,9 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/slang +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += x11/library/libx11 diff -r 60344306d223 -r 30b42c38bbc4 components/aalib/resolve.deps --- a/components/aalib/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -library/slang -shell/ksh93 -system/library -system/library/math -x11/library/libx11 diff -r 60344306d223 -r 30b42c38bbc4 components/acpidump/Makefile --- a/components/acpidump/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/acpidump/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,9 +20,11 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # +COMPILER = gcc + include ../../make-rules/shared-macros.mk COMPONENT_NAME= acpidump @@ -44,14 +46,12 @@ PUBLISH_STAMP= endif -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk PKG_PROTO_DIRS += $(BUILD_DIR_32) -COMPILER = gcc - COMPONENT_BUILD_ENV += CC=$(CC) @@ -69,6 +69,5 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/acpidump/resolve.deps --- a/components/acpidump/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/ant/Makefile --- a/components/ant/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/ant/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -38,9 +38,9 @@ TPNO= 16382 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk GMAKE=./build.sh @@ -77,6 +77,9 @@ test: $(TEST_32) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += developer/java/junit +REQUIRED_PACKAGES += developer/parser/antlr-2 +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/perl-516 +REQUIRED_PACKAGES += shell/ksh93 diff -r 60344306d223 -r 30b42c38bbc4 components/ant/resolve.deps --- a/components/ant/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/perl-512 -runtime/perl-516 -shell/ksh93 diff -r 60344306d223 -r 30b42c38bbc4 components/antlr/Makefile --- a/components/antlr/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/antlr/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -40,9 +40,9 @@ # Use version of Java defined in ../../make-rules/shared-macros.mk PATH=$(SPRO_VROOT)/bin:$(JAVA_HOME)/bin:/usr/bin -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PATCH_LEVEL = 0 @@ -75,6 +75,6 @@ test: $(TEST_32) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += shell/ksh93 diff -r 60344306d223 -r 30b42c38bbc4 components/antlr/resolve.deps --- a/components/antlr/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -shell/ksh93 diff -r 60344306d223 -r 30b42c38bbc4 components/apache2-modules/mod_dtrace/Makefile --- a/components/apache2-modules/mod_dtrace/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/apache2-modules/mod_dtrace/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -30,8 +30,8 @@ TPNO= 8876 -include ../../../make-rules/justmake.mk -include ../../../make-rules/ips.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk include ../modules.mk COMPONENT_BUILD_ARGS += APXS=$(APXS) @@ -40,7 +40,7 @@ ASLR_MODE = $(ASLR_NOT_APPLICABLE) -download: +download:: clobber: clean @@ -54,6 +54,5 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/apache2-modules/mod_dtrace/resolve.deps --- a/components/apache2-modules/mod_dtrace/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/apache2-modules/mod_fcgid/Makefile --- a/components/apache2-modules/mod_fcgid/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/apache2-modules/mod_fcgid/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 8878 -include ../../../make-rules/prep.mk -include ../../../make-rules/justmake.mk -include ../../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk include ../modules.mk PATCH_LEVEL=0 @@ -51,6 +51,5 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/apache2-modules/mod_fcgid/resolve.deps --- a/components/apache2-modules/mod_fcgid/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/apache2-modules/mod_jk/Makefile --- a/components/apache2-modules/mod_jk/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/apache2-modules/mod_jk/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -38,9 +38,9 @@ CONFIGURE_DEFAULT_DIRS=no DEFAULT_COMPILER=no -include ../../../make-rules/prep.mk -include ../../../make-rules/configure.mk -include ../../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk include ../modules.mk PATCH_LEVEL=0 @@ -57,6 +57,5 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/apache2-modules/mod_jk/resolve.deps --- a/components/apache2-modules/mod_jk/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/apache2-modules/mod_perl/Makefile --- a/components/apache2-modules/mod_perl/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/apache2-modules/mod_perl/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ CONFIGURE_DEFAULT_DIRS=no -include ../../../make-rules/prep.mk -include ../../../make-rules/justmake.mk -include ../../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk APACHE_USR_PREFIX=/usr/apache2/2.2 AP_PERL5LIB=$(APACHE_USR_PREFIX)/lib/perl @@ -74,6 +74,11 @@ test: $(TEST_32) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../../make-rules/depend.mk +REQUIRED_PACKAGES += library/apr-15 +REQUIRED_PACKAGES += library/apr-util-15 +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += web/server/apache-22 diff -r 60344306d223 -r 30b42c38bbc4 components/apache2-modules/mod_perl/resolve.deps --- a/components/apache2-modules/mod_perl/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -library/apr-13 -library/apr-15 -library/apr-util-13 -library/apr-util-15 -runtime/perl-512 -system/library -system/library/math -system/linker -web/server/apache-22 diff -r 60344306d223 -r 30b42c38bbc4 components/apache2-modules/mod_proxy_html/Makefile --- a/components/apache2-modules/mod_proxy_html/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/apache2-modules/mod_proxy_html/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -38,9 +38,9 @@ TPNO_MOD_PROXY_HTML= 9032 TPNO_MOD_XML2ENC= 9034 -include ../../../make-rules/prep.mk -include ../../../make-rules/justmake.mk -include ../../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk APACHE_USR_PREFIX=/usr/apache2/2.2 @@ -58,6 +58,5 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/apache2-modules/mod_proxy_html/resolve.deps --- a/components/apache2-modules/mod_proxy_html/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/apache2-modules/mod_security2/Makefile --- a/components/apache2-modules/mod_security2/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/apache2-modules/mod_security2/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 18233 -include ../../../make-rules/prep.mk -include ../../../make-rules/configure.mk -include ../../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk include ../modules.mk COMPONENT_POST_UNPACK_ACTION += \ @@ -61,6 +61,10 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../../make-rules/depend.mk +REQUIRED_PACKAGES += library/apr-15 +REQUIRED_PACKAGES += library/apr-util-15 +REQUIRED_PACKAGES += library/libxml2 +REQUIRED_PACKAGES += library/pcre +REQUIRED_PACKAGES += runtime/lua +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/apache2-modules/mod_security2/resolve.deps --- a/components/apache2-modules/mod_security2/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/apr-15 -library/apr-util-15 -library/libxml2 -library/pcre -runtime/lua -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/apache2-modules/mod_wsgi/Makefile --- a/components/apache2-modules/mod_wsgi/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/apache2-modules/mod_wsgi/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 19269 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk include ../modules.mk APACHE_USR_PREFIX = /usr/apache2/ @@ -80,4 +80,9 @@ install: $(INSTALL_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += runtime/python-27 +REQUIRED_PACKAGES += runtime/python-34 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/apache2-modules/mod_wsgi/resolve.deps --- a/components/apache2-modules/mod_wsgi/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 -system/library -system/library/math -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/apache2-modules/modules.mk --- a/components/apache2-modules/modules.mk Mon Feb 16 13:54:04 2015 -0800 +++ b/components/apache2-modules/modules.mk Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # APACHE_22_USR_PREFIX=/usr/apache2/2.2 @@ -76,3 +76,6 @@ ifeq ($(strip $(PARFAIT_BUILD)),yes) PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin endif + +REQUIRED_PACKAGES += web/server/apache-22 +REQUIRED_PACKAGES += web/server/apache-24 diff -r 60344306d223 -r 30b42c38bbc4 components/apache2/Makefile --- a/components/apache2/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/apache2/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -38,9 +38,9 @@ CONFIGURE_DEFAULT_DIRS=no -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_ENABLE) @@ -128,6 +128,21 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/apr-15 +REQUIRED_PACKAGES += library/apr-util-15 +REQUIRED_PACKAGES += library/apr-util-15/apr-ldap +REQUIRED_PACKAGES += library/apr-util-15/dbd-mysql +REQUIRED_PACKAGES += library/apr-util-15/dbd-sqlite +REQUIRED_PACKAGES += library/openldap +REQUIRED_PACKAGES += library/pcre +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/perl-516 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/library/security/gss +REQUIRED_PACKAGES += system/network diff -r 60344306d223 -r 30b42c38bbc4 components/apache2/resolve.deps --- a/components/apache2/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -library/apr-15 -library/apr-util-15 -library/apr-util-15/apr-ldap -library/apr-util-15/dbd-mysql -library/apr-util-15/dbd-sqlite -library/openldap -library/pcre -library/security/openssl -library/zlib -runtime/perl-512 -runtime/perl-516 -shell/ksh93 -system/core-os -system/library -system/library/math -system/library/security/gss -system/network diff -r 60344306d223 -r 30b42c38bbc4 components/apache24/Makefile --- a/components/apache24/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/apache24/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -37,9 +37,9 @@ CONFIGURE_DEFAULT_DIRS=no -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_ENABLE) @@ -82,6 +82,24 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) +REQUIRED_PACKAGES += library/apr-15 +REQUIRED_PACKAGES += library/apr-util-15 +REQUIRED_PACKAGES += library/apr-util-15/apr-ldap +REQUIRED_PACKAGES += library/apr-util-15/dbd-mysql +REQUIRED_PACKAGES += library/apr-util-15/dbd-sqlite +REQUIRED_PACKAGES += library/libxml2 +REQUIRED_PACKAGES += library/openldap +REQUIRED_PACKAGES += library/pcre +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/security/openssl/openssl-fips-140 +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += runtime/lua +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/perl-516 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/library/security/gss +REQUIRED_PACKAGES += system/network -include ../../make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/apache24/resolve.deps --- a/components/apache24/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -library/apr-15 -library/apr-util-15 -library/apr-util-15/apr-ldap -library/apr-util-15/dbd-mysql -library/apr-util-15/dbd-sqlite -library/libxml2 -library/openldap -library/pcre -library/security/openssl -library/security/openssl/openssl-fips-140 -library/zlib -runtime/lua -runtime/perl-512 -runtime/perl-516 -shell/ksh93 -system/core-os -system/library -system/library/math -system/library/security/gss -system/network diff -r 60344306d223 -r 30b42c38bbc4 components/apr-1_5/Makefile --- a/components/apr-1_5/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/apr-1_5/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ CONFIGURE_DEFAULT_DIRS=no -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Micro version for easy libraries packaging MICRO_VERSION:= $(shell echo $(COMPONENT_VERSION) | awk -F. '{ print $$3 }') @@ -87,6 +87,8 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += developer/documentation-tool/doxygen +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/apr-1_5/resolve.deps --- a/components/apr-1_5/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -shell/bash -shell/ksh93 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/apr-util-1_5/Makefile --- a/components/apr-util-1_5/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/apr-util-1_5/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ CONFIGURE_DEFAULT_DIRS=no -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Micro version for easy libraries packaging MICRO_VERSION:= $(shell echo $(COMPONENT_VERSION) | awk -F. '{ print $$3 }') @@ -86,6 +86,13 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += developer/documentation-tool/doxygen +REQUIRED_PACKAGES += database/mysql-55/library +REQUIRED_PACKAGES += database/sqlite-3 +REQUIRED_PACKAGES += library/apr-15 +REQUIRED_PACKAGES += library/expat +REQUIRED_PACKAGES += library/openldap +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/apr-util-1_5/resolve.deps --- a/components/apr-util-1_5/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -database/mysql-55/library -database/sqlite-3 -library/apr-15 -library/expat -library/openldap -shell/ksh93 -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/areca/Makefile --- a/components/areca/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/areca/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -43,9 +43,9 @@ TPNO= 6138 -include ../../make-rules/prep.mk -include ../../make-rules/ant.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ant.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_BUILD_TARGETS += install -buildfile build.xml COMPONENT_BUILD_ENV += ANT_OPTS="-Dfile.encoding=iso-8859-1" @@ -59,6 +59,7 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/java/swt +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += system/core-os diff -r 60344306d223 -r 30b42c38bbc4 components/areca/resolve.deps --- a/components/areca/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -library/java/swt -shell/bash -system/core-os diff -r 60344306d223 -r 30b42c38bbc4 components/asciidoc/Makefile --- a/components/asciidoc/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/asciidoc/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -37,9 +37,9 @@ TPNO= 14505 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PATCH_LEVEL = 0 @@ -101,6 +101,9 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/libxml2 +REQUIRED_PACKAGES += library/libxslt +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += web/browser/lynx +REQUIRED_PACKAGES += web/browser/w3m diff -r 60344306d223 -r 30b42c38bbc4 components/asciidoc/resolve.deps --- a/components/asciidoc/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -library/libxml2 -library/libxslt -runtime/python-26 -web/browser/lynx -web/browser/w3m diff -r 60344306d223 -r 30b42c38bbc4 components/autoconf/Makefile --- a/components/autoconf/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/autoconf/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 7252 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D)) @@ -59,6 +59,7 @@ test: $(TEST_32) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += developer/macro/gnu-m4 +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += shell/ksh93 diff -r 60344306d223 -r 30b42c38bbc4 components/autoconf/resolve.deps --- a/components/autoconf/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -developer/macro/gnu-m4 -runtime/perl-512 -shell/ksh93 diff -r 60344306d223 -r 30b42c38bbc4 components/autogen/Makefile --- a/components/autogen/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/autogen/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,6 +20,10 @@ # # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # + +# built in SFW with gcc and builds cleanly now only with gcc +COMPILER = gcc + include ../../make-rules/shared-macros.mk COMPONENT_NAME= autogen @@ -34,15 +38,13 @@ TPNO= 11805 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # build target is incorrect without this COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D)) -# built in SFW with gcc and builds cleanly now only with gcc -COMPILER = gcc CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" # strip the environment or install target fails @@ -76,6 +78,14 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/gmp +REQUIRED_PACKAGES += library/guile +REQUIRED_PACKAGES += library/libxml2 +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/gcc-3-runtime +REQUIRED_PACKAGES += system/library/gcc-45-runtime +REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/autogen/resolve.deps --- a/components/autogen/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -library/gmp -library/guile -library/libxml2 -shell/bash -system/library -system/library/gcc-3-runtime -system/library/gcc-45-runtime -system/library/gcc/gcc-c-runtime -system/library/math -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/automake/automake-1.10/Makefile --- a/components/automake/automake-1.10/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/automake/automake-1.10/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 6149 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR) CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" @@ -56,6 +56,6 @@ test: $(TEST_32) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += shell/ksh93 diff -r 60344306d223 -r 30b42c38bbc4 components/automake/automake-1.10/resolve.deps --- a/components/automake/automake-1.10/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/perl-512 -shell/ksh93 diff -r 60344306d223 -r 30b42c38bbc4 components/automake/automake-1.11.2/Makefile --- a/components/automake/automake-1.11.2/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/automake/automake-1.11.2/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 7253 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR) CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" @@ -55,6 +55,6 @@ test: $(TEST_32) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += shell/ksh93 diff -r 60344306d223 -r 30b42c38bbc4 components/automake/automake-1.11.2/resolve.deps --- a/components/automake/automake-1.11.2/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/perl-512 -shell/ksh93 diff -r 60344306d223 -r 30b42c38bbc4 components/bash/Makefile --- a/components/bash/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/bash/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 7265 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk BASH_PATCHLEVEL=$(shell grep -h "define PATCHLEVEL" $(COMPONENT_DIR)/patches/bash* | nawk '{print $$NF}' | sort -n | tail -1) IPS_COMPONENT_VERSION = $(COMPONENT_VERSION).$(BASH_PATCHLEVEL) @@ -141,6 +141,6 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/bash/resolve.deps --- a/components/bash/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -shell/ksh93 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/bcc/Makefile --- a/components/bcc/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/bcc/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,9 +20,11 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # +COMPILER = gcc + include ../../make-rules/shared-macros.mk COMPONENT_NAME= bcc @@ -37,11 +39,9 @@ TPNO= 8334 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk - -COMPILER = gcc +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D)) @@ -62,6 +62,5 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/bcc/resolve.deps --- a/components/bcc/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/beanshell/Makefile --- a/components/beanshell/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/beanshell/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -42,9 +42,9 @@ TPNO= 6200 -include ../../make-rules/prep.mk -include ../../make-rules/ant.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ant.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_BUILD_ARGS += -Ddist-dir=${PROTO_DIR} COMPONENT_BUILD_ARGS += -Djavadoc-dir=${PROTO_DIR} @@ -68,6 +68,5 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += shell/ksh93 diff -r 60344306d223 -r 30b42c38bbc4 components/beanshell/resolve.deps --- a/components/beanshell/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -shell/ksh93 diff -r 60344306d223 -r 30b42c38bbc4 components/berkeleydb/Makefile --- a/components/berkeleydb/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/berkeleydb/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -38,9 +38,9 @@ COMPONENT_ARCHIVE_URL= http://download.oracle.com/berkeley-db/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= database/berkeley -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = \ @@ -116,6 +116,8 @@ # By default "gmake test" runs standard tests, takes ~2 days per $(BITS). RUN=run_std -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) $(TCLSH) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/berkeleydb/resolve.deps --- a/components/berkeleydb/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -system/core-os -system/library -system/library/c++-runtime -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/bind/Makefile --- a/components/bind/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/bind/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ TPNO= 20537 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Build. # @@ -81,8 +81,6 @@ build: $(BUILD_32) -include ../../make-rules/shared-targets.mk - # Install. # # Currently manual pages are distributed from pkg:/system/manual@. @@ -168,6 +166,9 @@ test-clean: $(RM) $(TEST_32) $(FULL_TEST_32) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/libxml2 +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += network/dns/bind +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/bind/resolve.deps --- a/components/bind/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/libxml2 -library/security/openssl -network/dns/bind -shell/ksh93 -system/core-os -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/binutils/Makefile --- a/components/binutils/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/binutils/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 7483 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PARCH = $(MACH:i386=i386-pc) GNU_ARCH = $(PARCH:sparc=sparc-sun)-solaris$(SOLARIS_VERSION) @@ -72,8 +72,9 @@ install: $(INSTALL_32) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - test: $(TEST_32) -include ../../make-rules/depend.mk + +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/binutils/resolve.deps --- a/components/binutils/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -library/zlib -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/bison/Makefile --- a/components/bison/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/bison/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 6254 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_LIBDIR.32 = $(GNULIB) CONFIGURE_LIBDIR.64 = $(GNULIB)/$(MACH64) @@ -61,6 +61,6 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += developer/macro/gnu-m4 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/bison/resolve.deps --- a/components/bison/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -developer/macro/gnu-m4 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/bzip2/Makefile --- a/components/bzip2/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/bzip2/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,10 +37,10 @@ TPNO= 5547 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk # Enable ASLR for this component ASLR_MODE = $(ASLR_ENABLE) @@ -63,9 +63,7 @@ build: $(BUILD_32_and_64) # override the 64 bit install and have it make a directory for the lint lib -$(INSTALL_64): - $(MKDIR) $(PROTOUSRLIBDIR64) - touch $@ +COMPONENT_POST_INSTALL_ACTION = $(MKDIR) $(PROTOUSRLIBDIR64) install: build $(INSTALL_32_and_64) $(INSTALL) $(BUILD_DIR_32)/libbz2.so.1 $(PROTOUSRLIBDIR) @@ -77,6 +75,6 @@ # build does this always test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/bzip2/resolve.deps --- a/components/bzip2/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -shell/ksh93 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/cdrtools/Makefile --- a/components/cdrtools/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/cdrtools/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -42,9 +42,9 @@ PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin endif -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_INSTALL_ARGS += GMAKE_NOWARN=true COMPONENT_INSTALL_ARGS += CCOM=cc64 @@ -66,6 +66,7 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/cdrtools/resolve.deps --- a/components/cdrtools/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -shell/ksh93 -system/library -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/clisp/Makefile --- a/components/clisp/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/clisp/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,9 +20,11 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # +COMPILER= gcc + include ../../make-rules/shared-macros.mk COMPONENT_NAME= clisp @@ -37,9 +39,9 @@ TPNO= 8347 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # To include correct locale header file in .../modules/regexp/gllib/regex.c CPPFLAGS += -I/usr/share/gettext/intl @@ -60,8 +62,6 @@ COMPONENT_POST_CONFIGURE_ACTION = \ $(COMPONENT_POST_CONFIGURE_ACTION.$(MACH)) -COMPILER= gcc - PATCH_LEVEL= 0 # SHELLOPTS appears to cause clisp's configure script to fail while @@ -113,6 +113,10 @@ test: $(TEST_32) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/libsigsegv +REQUIRED_PACKAGES += library/ncurses +REQUIRED_PACKAGES += library/readline +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/clisp/resolve.deps --- a/components/clisp/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/libsigsegv -library/ncurses -library/readline -shell/ksh93 -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/cmake/Makefile --- a/components/cmake/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/cmake/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -36,9 +36,9 @@ TPNO= 6581 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Need to remove this option from LD_OPTIONS (only affects sparc build); # it causes a SegFault failure in kwsys/testSystemInformation @@ -95,6 +95,11 @@ # expected failure: CTestTestUpload test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += compress/bzip2 +REQUIRED_PACKAGES += library/expat +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += web/curl diff -r 60344306d223 -r 30b42c38bbc4 components/cmake/resolve.deps --- a/components/cmake/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -compress/bzip2 -library/expat -library/zlib -system/library -system/library/c++-runtime -system/library/math -system/linker -web/curl diff -r 60344306d223 -r 30b42c38bbc4 components/common/Makefile --- a/components/common/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/common/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -30,13 +30,13 @@ COMPONENT_VERSION= 0.5.11 COMPONENT_BUGDB= gate-stuff/userland -include ../../make-rules/prep.mk +include $(WS_MAKE_RULES)/prep.mk # Do not clean the sources (set in prep.mk) # CLEAN_PATHS= -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/ips.mk CLEAN_PATHS+= $(BUILD_DIR) @@ -53,7 +53,3 @@ @echo "Nothing to install." test: $(NO_TESTS) - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/common/resolve.deps --- a/components/common/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -#added to speed up dependency resolution -system/core-os diff -r 60344306d223 -r 30b42c38bbc4 components/conflict/Makefile --- a/components/conflict/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/conflict/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -38,9 +38,9 @@ TPNO= 8338 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Required to configure correctly. COMPONENT_PRE_CONFIGURE_ACTION = \ @@ -77,6 +77,5 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/conflict/resolve.deps --- a/components/conflict/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/convmv/Makefile --- a/components/convmv/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/convmv/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 8348 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk PATCH_LEVEL=0 @@ -54,6 +54,6 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/perl-516 diff -r 60344306d223 -r 30b42c38bbc4 components/convmv/resolve.deps --- a/components/convmv/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/perl-512 -runtime/perl-516 diff -r 60344306d223 -r 30b42c38bbc4 components/coreutils/Makefile --- a/components/coreutils/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/coreutils/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -34,9 +34,9 @@ TPNO= 18521 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # We need the GNU grep command to configure/build. PATH=/usr/gnu/bin:/usr/bin @@ -56,8 +56,10 @@ # Always show the build and link lines for easier debugging. COMPONENT_BUILD_ARGS += V=1 +# Enable ASLR for this component ASLR_MODE = $(ASLR_ENABLE) +# common targets configure: $(CONFIGURE_32_and_64) build: $(BUILD_32_and_64) @@ -94,6 +96,6 @@ test: install $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/gmp +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/coreutils/resolve.deps --- a/components/coreutils/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -library/gmp -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/cups/Makefile --- a/components/cups/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/cups/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 17705 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CXX += $(studio_NORUNPATH) @@ -91,12 +91,26 @@ build: $(BUILD_32) -include ../../make-rules/shared-targets.mk - install: $(INSTALL_32) test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += driver/parallel/ecpp +REQUIRED_PACKAGES += image/library/libjpeg +REQUIRED_PACKAGES += image/library/libpng +REQUIRED_PACKAGES += image/library/libtiff +REQUIRED_PACKAGES += library/print/cups-libs +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += service/network/slp +REQUIRED_PACKAGES += service/security/kerberos-5 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/libdbus +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/library/security/gss +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/cups/resolve.deps --- a/components/cups/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -image/library/libjpeg -image/library/libpng -image/library/libtiff -library/print/cups-libs -library/security/openssl -library/zlib -runtime/perl-512 -service/network/slp -service/security/kerberos-5 -shell/ksh93 -system/core-os -system/library -system/library/c++-runtime -system/library/libdbus -system/library/math -system/library/security/gss -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/curl/Makefile --- a/components/curl/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/curl/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -34,10 +34,10 @@ TPNO= 21343 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk PATCH_LEVEL = 0 @@ -107,6 +107,12 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/libidn +REQUIRED_PACKAGES += library/libssh2 +REQUIRED_PACKAGES += library/openldap +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/security/gss diff -r 60344306d223 -r 30b42c38bbc4 components/curl/resolve.deps --- a/components/curl/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -library/libidn -library/openldap -library/libssh2 -library/security/openssl -library/zlib -shell/ksh93 -system/library -system/library/security/gss diff -r 60344306d223 -r 30b42c38bbc4 components/cvs/Makefile --- a/components/cvs/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/cvs/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -35,9 +35,9 @@ TPNO= 6323 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CFLAGS += -D__ATTRIBUTE_DISABLED CONFIGURE_OPTIONS += --with-external-zlib @@ -58,6 +58,6 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/cvs/resolve.deps --- a/components/cvs/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -library/zlib -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/daq/Makefile --- a/components/daq/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/daq/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 19384 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Solaris should really define these. See CR #15431883 and 15537286. CFLAGS += -Du_int8_t=uint8_t @@ -61,6 +61,10 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += developer/lexer/flex +REQUIRED_PACKAGES += developer/parser/bison +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/libpcap +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/daq/resolve.deps --- a/components/daq/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -shell/ksh93 -system/library -system/library/libpcap -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/dejagnu/Makefile --- a/components/dejagnu/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/dejagnu/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -37,9 +37,9 @@ TPNO= 12292 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_TEST_ENV += PATH="$(GNUBIN):$(PATH)" @@ -61,6 +61,6 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) +REQUIRED_PACKAGES += shell/expect +REQUIRED_PACKAGES += shell/ksh93 -include ../../make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/dejagnu/resolve.deps --- a/components/dejagnu/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -shell/expect -shell/ksh93 diff -r 60344306d223 -r 30b42c38bbc4 components/diffstat/Makefile --- a/components/diffstat/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/diffstat/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -34,9 +34,9 @@ TPNO= 5494 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CC += $(CC_BITS) @@ -56,6 +56,5 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) +REQUIRED_PACKAGES += system/library -include ../../make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/diffstat/resolve.deps --- a/components/diffstat/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/diffutils/Makefile --- a/components/diffutils/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/diffutils/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 10502 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Need to reduce optimization level in order to successfully run the # configure test for detecting whether Solaris can detect stack overflow. @@ -60,6 +60,5 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/diffutils/resolve.deps --- a/components/diffutils/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/dnsmasq/Makefile --- a/components/dnsmasq/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/dnsmasq/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -40,9 +40,9 @@ TPNO= 16307 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk # Enable ASLR for this component ASLR_MODE = $(ASLR_ENABLE) @@ -64,6 +64,7 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/libidn +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/dnsmasq/resolve.deps --- a/components/dnsmasq/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -library/libidn -system/core-os -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/doxygen/Makefile --- a/components/doxygen/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/doxygen/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -40,9 +40,9 @@ TPNO= 17646 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Necessary to find CC during build PATH=$(SPRO_VROOT)/bin:/usr/bin @@ -89,6 +89,9 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += developer/lexer/flex +REQUIRED_PACKAGES += developer/parser/bison +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/doxygen/resolve.deps --- a/components/doxygen/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -system/library -system/library/c++-runtime -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/ejabberd/Makefile --- a/components/ejabberd/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/ejabberd/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -39,11 +39,9 @@ COMPONENT_BUGDB= service/ejabberd TPNO= 21408 -include ../../make-rules/prep.mk - - -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_SCRIPT = $(SOURCE_DIR)/src/configure BUILD_DIR_64 = $(BUILD_DIR)/$(MACH64)/src @@ -70,6 +68,11 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/expat +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/network diff -r 60344306d223 -r 30b42c38bbc4 components/ejabberd/resolve.deps --- a/components/ejabberd/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -library/expat -library/security/openssl -library/zlib -shell/ksh93 -system/core-os -system/library -system/network diff -r 60344306d223 -r 30b42c38bbc4 components/elinks/Makefile --- a/components/elinks/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/elinks/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,6 +20,10 @@ # # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # + +# Because the Studio compiler generates thousands of lines of warnings. +COMPILER=gcc + include ../../make-rules/shared-macros.mk COMPONENT_NAME= elinks @@ -34,12 +38,9 @@ TPNO= 8340 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk - -# Because the Studio compiler generates thousands of lines of warnings. -COMPILER = gcc +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Always show the build and link lines for easier debugging. COMPONENT_BUILD_ARGS += V=1 @@ -75,6 +76,11 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += compress/bzip2 +REQUIRED_PACKAGES += library/expat +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += x11/library/libx11 diff -r 60344306d223 -r 30b42c38bbc4 components/elinks/resolve.deps --- a/components/elinks/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -compress/bzip2 -library/expat -library/security/openssl -library/zlib -system/library -system/linker -x11/library/libx11 diff -r 60344306d223 -r 30b42c38bbc4 components/emacs/Makefile --- a/components/emacs/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/emacs/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 15684 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # we build three different variants of emacs for our users. As Solaris # always has a 64-bit kernel, and 64-bit emacs can handle larger files, @@ -183,6 +183,37 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += editor/gnu-emacs +REQUIRED_PACKAGES += file/gnu-findutils +REQUIRED_PACKAGES += gnome/config/gconf +REQUIRED_PACKAGES += image/imagemagick +REQUIRED_PACKAGES += image/library/libjpeg +REQUIRED_PACKAGES += image/library/libpng +REQUIRED_PACKAGES += image/library/librsvg +REQUIRED_PACKAGES += image/library/libtiff +REQUIRED_PACKAGES += library/desktop/cairo +REQUIRED_PACKAGES += library/desktop/gdk-pixbuf +REQUIRED_PACKAGES += library/desktop/gtk3 +REQUIRED_PACKAGES += library/desktop/pango +REQUIRED_PACKAGES += library/glib2 +REQUIRED_PACKAGES += library/gnutls +REQUIRED_PACKAGES += library/libxml2 +REQUIRED_PACKAGES += library/ncurses +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/perl-516 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/fontconfig +REQUIRED_PACKAGES += system/library/freetype-2 +REQUIRED_PACKAGES += system/library/libdbus +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += x11/library/libice +REQUIRED_PACKAGES += x11/library/libsm +REQUIRED_PACKAGES += x11/library/libx11 +REQUIRED_PACKAGES += x11/library/libxft +REQUIRED_PACKAGES += x11/library/libxmu +REQUIRED_PACKAGES += x11/library/libxpm +REQUIRED_PACKAGES += x11/library/libxrender +REQUIRED_PACKAGES += x11/library/toolkit/libxaw7 +REQUIRED_PACKAGES += x11/library/toolkit/libxt diff -r 60344306d223 -r 30b42c38bbc4 components/emacs/resolve.deps --- a/components/emacs/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -editor/gnu-emacs -file/gnu-findutils -gnome/config/gconf -image/imagemagick -image/library/libjpeg -image/library/libpng -image/library/librsvg -image/library/libtiff -library/desktop/cairo -library/desktop/gdk-pixbuf -library/desktop/gtk3 -library/desktop/pango -library/glib2 -library/gnutls -library/libxml2 -library/ncurses -runtime/perl-512 -runtime/perl-516 -shell/ksh93 -system/library -system/library/fontconfig -system/library/freetype-2 -system/library/libdbus -system/library/math -x11/library/libice -x11/library/libsm -x11/library/libx11 -x11/library/libxft -x11/library/libxmu -x11/library/libxpm -x11/library/libxrender -x11/library/toolkit/libxaw7 -x11/library/toolkit/libxt diff -r 60344306d223 -r 30b42c38bbc4 components/enscript/Makefile --- a/components/enscript/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/enscript/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -49,9 +49,9 @@ TPNO= 4380 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PATCH_LEVEL = 1 @@ -84,6 +84,9 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/perl-516 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/enscript/resolve.deps --- a/components/enscript/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -runtime/perl-512 -runtime/perl-516 -shell/ksh93 -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/erlang/Makefile --- a/components/erlang/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/erlang/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,9 +20,12 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # +# Built in SFW with gcc and builds cleanly now only with gcc +COMPILER = gcc + include ../../make-rules/shared-macros.mk PATH=$(SPRO_VROOT)/bin:$(JAVA_HOME)/bin:/usr/bin @@ -60,9 +63,9 @@ TPNO= 18548 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # IPS_COMPONENT_VERSION is by default set to $(COMPONENT_VERSION) but it is not # enough for us. We need to include the $(COMPONENT_SUBVERSION) somehow. @@ -71,9 +74,6 @@ # R(major)(minor)(micro) - (major).(minor as number).(micro) IPS_COMPONENT_VERSION= $(COMPONENT_VERSION_MAJOR).2.3 -# Built in SFW with gcc and builds cleanly now only with gcc -COMPILER = gcc - CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" CONFIGURE_OPTIONS += CPPFLAGS="$(CPPFLAGS) -I/usr/include/gd2" CONFIGURE_OPTIONS += --enable-smp-support @@ -136,6 +136,11 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/ncurses +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/erlang/resolve.deps --- a/components/erlang/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -library/ncurses -library/security/openssl -shell/ksh93 -system/core-os -system/library -system/library/math -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/fastcgi/Makefile --- a/components/fastcgi/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/fastcgi/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -38,10 +38,10 @@ TPNO= 8415 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk CONFIGURE_OPTIONS += --disable-static CONFIGURE_OPTIONS += --with-pic @@ -62,6 +62,6 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime diff -r 60344306d223 -r 30b42c38bbc4 components/fastcgi/resolve.deps --- a/components/fastcgi/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -system/library -system/library/c++-runtime diff -r 60344306d223 -r 30b42c38bbc4 components/fetchmail/Makefile --- a/components/fetchmail/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/fetchmail/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 8416 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" CONFIGURE_OPTIONS += PYTHON="$(PYTHON.2.7.32)" @@ -65,6 +65,10 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/python/tkinter-27 +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += runtime/python-27 +REQUIRED_PACKAGES += service/security/kerberos-5 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/fetchmail/resolve.deps --- a/components/fetchmail/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/python/tkinter-27 -library/security/openssl -runtime/python-27 -service/security/kerberos-5 -shell/ksh93 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/findutils/Makefile --- a/components/findutils/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/findutils/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 15520 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_PREFIX = /usr/gnu @@ -62,6 +62,6 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/findutils/resolve.deps --- a/components/findutils/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/flex/Makefile --- a/components/flex/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/flex/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -40,9 +40,9 @@ SONAME=libfl.so.1 LDFLAGS = $(CC_BITS) -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR) CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" @@ -58,8 +58,6 @@ COMPONENT_BUILD_TARGETS += $(SONAME) COMPONENT_INSTALL_TARGETS += $(SONAME) -include ../../make-rules/shared-targets.mk - ASLR_MODE=$(ASLR_ENABLE) # common targets @@ -71,6 +69,6 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += developer/macro/gnu-m4 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/flex/resolve.deps --- a/components/flex/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -developer/macro/gnu-m4 -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/foomatic/db-engine/Makefile --- a/components/foomatic/db-engine/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/foomatic/db-engine/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 6399 -include ../../../make-rules/prep.mk -include ../../../make-rules/configure.mk -include ../../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" CONFIGURE_OPTIONS += PERL=$(PERL) @@ -72,6 +72,8 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../../make-rules/depend.mk +REQUIRED_PACKAGES += library/libxml2 +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/foomatic/db-engine/resolve.deps --- a/components/foomatic/db-engine/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -library/libxml2 -runtime/perl-512 -shell/bash -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/foomatic/db/Makefile --- a/components/foomatic/db/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/foomatic/db/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,12 +34,9 @@ TPNO= 6398 -include ../../../make-rules/prep.mk -include ../../../make-rules/configure.mk -include ../../../make-rules/ips.mk - -# This package delivers only data files and has no dependencies. -EXTDEPFILES = $(NULLDEPFILE) +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = $(CLONEY) $(SOURCE_DIR) $(@D) @@ -59,6 +56,3 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../../make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/foomatic/filters/Makefile --- a/components/foomatic/filters/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/foomatic/filters/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 8420 -include ../../../make-rules/prep.mk -include ../../../make-rules/configure.mk -include ../../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += --prefix=$(USRLIBDIR)/lp CONFIGURE_OPTIONS += --sysconfdir=$(ETCDIR)/gnu @@ -59,6 +59,8 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../../make-rules/depend.mk +REQUIRED_PACKAGES += print/filter/a2ps +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/libdbus +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/foomatic/filters/resolve.deps --- a/components/foomatic/filters/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -print/filter/a2ps -system/library -system/library/libdbus -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/foomatic/fppd/Makefile --- a/components/foomatic/fppd/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/foomatic/fppd/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,11 +34,8 @@ TPNO= 6400 -include ../../../make-rules/prep.mk -include ../../../make-rules/ips.mk - -# This package delivers only data files and has no dependencies. -EXTDEPFILES = $(NULLDEPFILE) +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk CACHE_FILE=$(PROTOUSRLIBDIR)/lp/caches/SUNWfoomatic.cache @@ -67,4 +64,3 @@ clean:: $(RM) -r $(BUILD_DIR) -include ../../../make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/fping/Makefile --- a/components/fping/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/fping/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -38,9 +38,9 @@ TPNO= 5500 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = \ ($(CLONEY) $(SOURCE_DIR) $(@D)) @@ -58,6 +58,5 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/fping/resolve.deps --- a/components/fping/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/gawk/Makefile --- a/components/gawk/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/gawk/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -39,9 +39,9 @@ TPNO= 6808 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin CONFIGURE_LIBDIR.64 = $(CONFIGURE_PREFIX)/lib @@ -61,6 +61,8 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/libsigsegv +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/gawk/resolve.deps --- a/components/gawk/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -library/libsigsegv -shell/ksh93 -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/gcc3/Makefile --- a/components/gcc3/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/gcc3/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,10 +18,13 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk +# Build gcc with gcc +COMPILER = gcc + COMPONENT_NAME= gcc COMPONENT_VERSION= 3.4.3 COMPONENT_PROJECT_URL= http://gcc.gnu.org/ @@ -35,18 +38,15 @@ TPNO= 17028 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PARCH = $(MACH:i386=i386-pc) GNU_ARCH = $(PARCH:sparc=sparc-sun)-solaris$(SOLARIS_VERSION) PKG_MACROS += GNU_ARCH="$(GNU_ARCH)" -# we build gcc with gcc -COMPILER = gcc3 - # CC_BITS may get in the way CC_BITS= @@ -92,8 +92,15 @@ install: $(PROTO_DIR)/.sedded -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - test: $(TEST_32) -include ../../make-rules/depend.mk + +REQUIRED_PACKAGES += developer/assembler +REQUIRED_PACKAGES += developer/gnu-binutils +REQUIRED_PACKAGES += developer/lexer/flex +REQUIRED_PACKAGES += developer/parser/bison +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/gcc-3-runtime +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/gcc3/resolve.deps --- a/components/gcc3/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -developer/assembler -developer/gnu-binutils -shell/ksh93 -system/library -system/library/gcc-3-runtime -system/library/math -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/gcc45/Makefile --- a/components/gcc45/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/gcc45/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ TPNO= 4456 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PATH=/usr/bin:/usr/gnu/bin:/usr/perl5/bin @@ -106,6 +106,15 @@ test: $(TEST_32) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += developer/assembler +REQUIRED_PACKAGES += developer/gnu-binutils +REQUIRED_PACKAGES += library/gmp +REQUIRED_PACKAGES += library/mpc +REQUIRED_PACKAGES += library/mpfr +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/gcc-45-runtime +REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/gcc45/resolve.deps --- a/components/gcc45/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -developer/assembler -developer/gnu-binutils -library/gmp -library/mpc -library/mpfr -shell/ksh93 -system/library -system/library/gcc-45-runtime -system/library/gcc/gcc-c-runtime -system/library/math -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/gcc47/Makefile --- a/components/gcc47/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/gcc47/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14467 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # The GNU compiler wants the GNU utilities. PATH=/usr/gnu/bin:/usr/bin:/usr/perl5/bin @@ -128,6 +128,11 @@ test: $(TEST_32) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/gmp +REQUIRED_PACKAGES += library/mpc +REQUIRED_PACKAGES += library/mpfr +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/gcc47/resolve.deps --- a/components/gcc47/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -library/gmp -library/mpc -library/mpfr -system/library -system/library/gcc/gcc-c-runtime -system/library/math -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/gcc48/Makefile --- a/components/gcc48/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/gcc48/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,10 +18,12 @@ # # CDDL HEADER END # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # export PARFAIT_BUILD=no +COMPILER=gcc + include ../../make-rules/shared-macros.mk COMPONENT_NAME= gcc @@ -36,11 +38,9 @@ TPNO= 15448 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk - -COMPILER=gcc +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # The GNU compiler wants the GNU utilities. PATH=/usr/gnu/bin:/usr/bin:/usr/perl5/bin @@ -134,6 +134,13 @@ test: $(TEST_32) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/gmp +REQUIRED_PACKAGES += library/mpc +REQUIRED_PACKAGES += library/mpfr +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/gcc48/resolve.deps --- a/components/gcc48/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -library/gmp -library/mpc -library/mpfr -system/library -system/library/gcc/gcc-c-runtime -system/library/math -system/linker -shell/bash -shell/ksh93 diff -r 60344306d223 -r 30b42c38bbc4 components/gd2/Makefile --- a/components/gd2/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/gd2/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,10 +37,10 @@ TPNO= 8786 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk PKG_CONFIG_PATH_32 = /usr/lib/pkgconfig PKG_CONFIG_PATH_64 = /usr/lib/$(MACH64)/pkgconfig @@ -82,7 +82,15 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) + -include ../../make-rules/depend.mk - +REQUIRED_PACKAGES += image/library/libjpeg +REQUIRED_PACKAGES += image/library/libpng +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/fontconfig +REQUIRED_PACKAGES += system/library/freetype-2 +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += x11/library/libx11 +REQUIRED_PACKAGES += x11/library/libxpm diff -r 60344306d223 -r 30b42c38bbc4 components/gd2/resolve.deps --- a/components/gd2/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -image/library/libjpeg -image/library/libpng -library/zlib -shell/ksh93 -system/library -system/library/fontconfig -system/library/freetype-2 -system/library/math -x11/library/libx11 -x11/library/libxpm diff -r 60344306d223 -r 30b42c38bbc4 components/gdb/Makefile --- a/components/gdb/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/gdb/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,9 +20,17 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # +# There are a large number of macros in the GCB code written +# specifically for GCC's preprocessor. Studio does not expand +# these macros the same way GCC does, and the resulting gdb is +# not usable. Building gdb with a GCC >= 4.7.2 produces very +# good results, even on SPARC. +COMPILER=gcc +GCCHOME=/usr/gcc/4.7 + include ../../make-rules/shared-macros.mk COMPONENT_NAME= gdb @@ -37,17 +45,10 @@ TPNO= 17258 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk -# There are a large number of macros in the GCB code written -# specifically for GCC's preprocessor. Studio does not expand -# these macros the same way GCC does, and the resulting gdb is -# not usable. Building gdb with a GCC >= 4.7.2 produces very -# good results, even on SPARC. -COMPILER=gcc -GCCHOME=/usr/gcc/4.7 # GDB wants the GNU utilities PATH=/usr/gnu/bin:$(GCCHOME)/bin:/usr/bin:/usr/perl5/bin @@ -139,6 +140,15 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += compress/xz +REQUIRED_PACKAGES += library/expat +REQUIRED_PACKAGES += library/ncurses +REQUIRED_PACKAGES += library/readline +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += text/texinfo diff -r 60344306d223 -r 30b42c38bbc4 components/gdb/resolve.deps --- a/components/gdb/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -compress/xz -library/expat -library/ncurses -library/readline -library/zlib -runtime/python-26 -shell/ksh93 -system/library -system/library/math -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/gdbm/Makefile --- a/components/gdbm/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/gdbm/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 8440 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += --disable-static CONFIGURE_OPTIONS += --enable-shared @@ -59,6 +59,5 @@ COMPONENT_TEST_TARGETS = progs test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/gdbm/resolve.deps --- a/components/gdbm/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/getopt/Makefile --- a/components/getopt/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/getopt/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 11356 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk # getopt doesn't use configure, override the hard-wired values in the Makefile. CC += "$(CC_BITS)" @@ -74,6 +74,5 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/getopt/resolve.deps --- a/components/getopt/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/gettext/Makefile --- a/components/gettext/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/gettext/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -38,9 +38,9 @@ TPNO= 20141 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += --disable-java CONFIGURE_OPTIONS += --disable-libasprintf @@ -79,6 +79,13 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += developer/icu +REQUIRED_PACKAGES += developer/vala +REQUIRED_PACKAGES += library/expat +REQUIRED_PACKAGES += library/icu +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += source/locale/localedef +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/locale/extra diff -r 60344306d223 -r 30b42c38bbc4 components/gettext/resolve.deps --- a/components/gettext/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -library/expat -shell/ksh93 -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/ggrep/Makefile --- a/components/ggrep/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/ggrep/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 18300 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # We need to be able to return from void functions CFLAGS += $(studio_FEATURES_EXTENSIONS) @@ -69,6 +69,7 @@ # test-mbrtowc3.sh, test-mbrtowc4.sh, test-mbsrtowcs4.sh test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/pcre +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/ggrep/resolve.deps --- a/components/ggrep/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -library/pcre -system/library -shell/bash diff -r 60344306d223 -r 30b42c38bbc4 components/ghostscript/Makefile --- a/components/ghostscript/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/ghostscript/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -19,7 +19,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # # parfait seems to spin when looking at the .bc files (13704877), so @@ -41,9 +41,9 @@ TPNO= 3796 -include ../../make-rules/prep.mk -include ../../make-rules/ips.mk -include ../../make-rules/configure.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/configure.mk PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin @@ -113,4 +113,20 @@ test: $(NO_TESTS) -include ../../make-rules/depend.mk + +REQUIRED_PACKAGES += image/library/libjpeg +REQUIRED_PACKAGES += image/library/libpng +REQUIRED_PACKAGES += library/desktop/gtk2 +REQUIRED_PACKAGES += library/glib2 +REQUIRED_PACKAGES += library/print/cups-libs +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += print/cups +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/fontconfig +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += x11/library/libx11 +REQUIRED_PACKAGES += x11/library/libxcursor +REQUIRED_PACKAGES += x11/library/toolkit/libxt diff -r 60344306d223 -r 30b42c38bbc4 components/ghostscript/resolve.deps --- a/components/ghostscript/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -image/library/libjpeg -image/library/libpng -library/desktop/gtk2 -library/glib2 -library/print/cups-libs -library/zlib -runtime/perl-512 -shell/ksh93 -system/library -system/library/fontconfig -system/library/math -system/linker -x11/library/libx11 -x11/library/libxcursor -x11/library/toolkit/libxt diff -r 60344306d223 -r 30b42c38bbc4 components/git/Makefile --- a/components/git/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/git/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -42,9 +42,9 @@ sha256:c653a3678bb5668c280a0d5ba584fdfb0e4272acbbd00901dc2363ea3f58eede COMPONENT_ARCHIVE_URL_1 = http://git-core.googlecode.com/files/$(COMPONENT_ARCHIVE_1) -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin CONFIGURE_LIBDIR.64 = $(CONFIGURE_PREFIX)/lib @@ -111,6 +111,12 @@ $(TOUCH) $@ -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/expat +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += web/curl diff -r 60344306d223 -r 30b42c38bbc4 components/git/resolve.deps --- a/components/git/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -library/expat -library/zlib -runtime/perl-512 -runtime/python-26 -shell/bash -shell/ksh93 -system/library -web/curl diff -r 60344306d223 -r 30b42c38bbc4 components/gnu-gs-fonts-other/Makefile --- a/components/gnu-gs-fonts-other/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/gnu-gs-fonts-other/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -19,7 +19,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -40,11 +40,8 @@ PROTOGSSHAREDIR=$(PROTOUSRSHAREDIR)/ghostscript -include ../../make-rules/prep.mk -include ../../make-rules/ips.mk - -# This package delivers only data files and has no dependencies. -EXTDEPFILES = $(NULLDEPFILE) +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -61,4 +58,3 @@ clean:: $(RM) -r $(BUILD_DIR) -include ../../make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/gnu-gs-fonts-std/Makefile --- a/components/gnu-gs-fonts-std/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/gnu-gs-fonts-std/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -19,7 +19,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -40,11 +40,8 @@ PROTOGSSHAREDIR=$(PROTOUSRSHAREDIR)/ghostscript -include ../../make-rules/prep.mk -include ../../make-rules/ips.mk - -# This package delivers only data files and has no dependencies. -EXTDEPFILES = $(NULLDEPFILE) +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -61,4 +58,3 @@ clean:: $(RM) -r $(BUILD_DIR) -include ../../make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/gnump/Makefile --- a/components/gnump/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/gnump/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -19,7 +19,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -39,10 +39,10 @@ TPNO= 16955 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk PATCH_LEVEL = 0 @@ -161,6 +161,6 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime diff -r 60344306d223 -r 30b42c38bbc4 components/gnump/resolve.deps --- a/components/gnump/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -system/library -system/library/c++-runtime diff -r 60344306d223 -r 30b42c38bbc4 components/gnupg/Makefile --- a/components/gnupg/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/gnupg/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 17706 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Enable C99 mode + -Xc for its additional warnings. studio_C99MODE = -Xc $(studio_C99_ENABLE) @@ -124,6 +124,20 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += compress/bzip2 +REQUIRED_PACKAGES += library/desktop/gtk2 +REQUIRED_PACKAGES += library/desktop/pango +REQUIRED_PACKAGES += library/glib2 +REQUIRED_PACKAGES += library/pth +REQUIRED_PACKAGES += library/readline +REQUIRED_PACKAGES += library/security/libassuan +REQUIRED_PACKAGES += library/security/libgpg-error +REQUIRED_PACKAGES += library/security/libksba +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += security/pinentry +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/security/libgcrypt +REQUIRED_PACKAGES += system/library/usb/libusb +REQUIRED_PACKAGES += web/curl diff -r 60344306d223 -r 30b42c38bbc4 components/gnupg/resolve.deps --- a/components/gnupg/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -compress/bzip2 -library/pth -library/readline -library/security/libassuan -library/security/libgpg-error -library/security/libksba -library/zlib -security/pinentry -shell/ksh93 -system/library -system/library/security/libgcrypt -system/library/usb/libusb -web/curl diff -r 60344306d223 -r 30b42c38bbc4 components/gnuplot/Makefile --- a/components/gnuplot/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/gnuplot/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -41,9 +41,9 @@ COMPONENT_BUILD_TARGETS = all info -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += --libexecdir=$(CONFIGURE_LIBDIR.$(BITS)) CONFIGURE_OPTIONS += --sysconfdir=/etc/gnu @@ -57,8 +57,6 @@ # Enable aslr for this component ASLR_MODE = $(ASLR_ENABLE) -include ../../make-rules/shared-targets.mk - # common targets configure: $(CONFIGURE_64) @@ -68,6 +66,39 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += image/library/libjpeg +REQUIRED_PACKAGES += image/library/libpng +REQUIRED_PACKAGES += library/desktop/atk +REQUIRED_PACKAGES += library/desktop/cairo +REQUIRED_PACKAGES += library/desktop/gdk-pixbuf +REQUIRED_PACKAGES += library/desktop/gtk2 +REQUIRED_PACKAGES += library/desktop/pango +REQUIRED_PACKAGES += library/desktop/xdg/libcanberra +REQUIRED_PACKAGES += library/gd +REQUIRED_PACKAGES += library/glib2 +REQUIRED_PACKAGES += library/graphics/wxwidgets +REQUIRED_PACKAGES += library/ncurses +REQUIRED_PACKAGES += library/readline +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += runtime/lua +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/font/truetype/liberation +REQUIRED_PACKAGES += system/font/xorg/xorg-core +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/fontconfig +REQUIRED_PACKAGES += system/library/freetype-2 +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += x11/library/libx11 +REQUIRED_PACKAGES += x11/library/libxcomposite +REQUIRED_PACKAGES += x11/library/libxcursor +REQUIRED_PACKAGES += x11/library/libxdamage +REQUIRED_PACKAGES += x11/library/libxevie +REQUIRED_PACKAGES += x11/library/libxext +REQUIRED_PACKAGES += x11/library/libxfixes +REQUIRED_PACKAGES += x11/library/libxi +REQUIRED_PACKAGES += x11/library/libxinerama +REQUIRED_PACKAGES += x11/library/libxpm +REQUIRED_PACKAGES += x11/library/libxrandr +REQUIRED_PACKAGES += x11/library/libxrender +REQUIRED_PACKAGES += x11/library/libxscrnsaver diff -r 60344306d223 -r 30b42c38bbc4 components/gnuplot/resolve.deps --- a/components/gnuplot/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -image/library/libjpeg -image/library/libpng -library/desktop/atk -library/desktop/cairo -library/desktop/gdk-pixbuf -library/desktop/gtk2 -library/desktop/pango -library/desktop/xdg/libcanberra -library/gd -library/glib2 -library/graphics/wxwidgets -library/ncurses -library/readline -library/zlib -runtime/lua -shell/ksh93 -system/font/truetype/liberation -system/font/xorg/xorg-core -system/library -system/library/c++-runtime -system/library/fontconfig -system/library/freetype-2 -system/library/math -x11/library/libx11 -x11/library/libxcomposite -x11/library/libxcursor -x11/library/libxdamage -x11/library/libxevie -x11/library/libxext -x11/library/libxfixes -x11/library/libxi -x11/library/libxinerama -x11/library/libxpm -x11/library/libxrandr -x11/library/libxrender -x11/library/libxscrnsaver diff -r 60344306d223 -r 30b42c38bbc4 components/gnupth/Makefile --- a/components/gnupth/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/gnupth/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 8899 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PATCH_LEVEL = 0 @@ -79,6 +79,6 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/gnupth/resolve.deps --- a/components/gnupth/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -shell/ksh93 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/gocr/Makefile --- a/components/gocr/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/gocr/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 8587 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PKG_PROTO_DIRS += $(COMPONENT_SRC) @@ -62,6 +62,7 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/gocr/resolve.deps --- a/components/gocr/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -shell/ksh93 -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/gperf/Makefile --- a/components/gperf/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/gperf/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 8589 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin @@ -55,6 +55,7 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/gperf/resolve.deps --- a/components/gperf/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -system/library -system/library/c++-runtime -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/gpgme/Makefile --- a/components/gpgme/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/gpgme/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 8637 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PATCH_LEVEL = 0 @@ -85,6 +85,9 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/pth +REQUIRED_PACKAGES += library/security/libgpg-error +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/gpgme/resolve.deps --- a/components/gpgme/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -library/pth -library/security/libgpg-error -shell/ksh93 -system/library -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/grails/Makefile --- a/components/grails/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/grails/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 8709 -include ../../make-rules/prep.mk -include ../../make-rules/ant.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ant.mk +include $(WS_MAKE_RULES)/ips.mk # Make sure we use the specially modified versions of grails and grails-debug COMPONENT_POST_UNPACK_ACTION = \ @@ -75,6 +75,9 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/perl-516 +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += shell/ksh93 diff -r 60344306d223 -r 30b42c38bbc4 components/grails/resolve.deps --- a/components/grails/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -runtime/perl-512 -runtime/perl-516 -runtime/python-26 -shell/bash -shell/ksh93 diff -r 60344306d223 -r 30b42c38bbc4 components/graphviz/Makefile --- a/components/graphviz/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/graphviz/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # PERL_VERSION = 5.16 @@ -38,9 +38,9 @@ TPNO= 17707 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PATH = /usr/php/5.3/bin:/usr/bin:/usr/gnu/bin @@ -109,4 +109,37 @@ # http://graphviz.org/bugs/b2063.html test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) +REQUIRED_PACKAGES += image/graphviz +REQUIRED_PACKAGES += image/library/libjpeg +REQUIRED_PACKAGES += image/library/libpng +REQUIRED_PACKAGES += image/library/librsvg +REQUIRED_PACKAGES += library/desktop/atk +REQUIRED_PACKAGES += library/desktop/cairo +REQUIRED_PACKAGES += library/desktop/gdk-pixbuf +REQUIRED_PACKAGES += library/desktop/gtk2 +REQUIRED_PACKAGES += library/desktop/pango +REQUIRED_PACKAGES += library/expat +REQUIRED_PACKAGES += library/gd +REQUIRED_PACKAGES += library/glib2 +REQUIRED_PACKAGES += library/libtool/libltdl +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += print/filter/ghostscript +REQUIRED_PACKAGES += runtime/lua +REQUIRED_PACKAGES += runtime/ocaml +REQUIRED_PACKAGES += runtime/perl-516 +REQUIRED_PACKAGES += runtime/ruby-19 +REQUIRED_PACKAGES += runtime/tk-8 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/fontconfig +REQUIRED_PACKAGES += system/library/freetype-2 +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += web/php-53 +REQUIRED_PACKAGES += x11/library/libx11 +REQUIRED_PACKAGES += x11/library/libxcursor +REQUIRED_PACKAGES += x11/library/libxmu +REQUIRED_PACKAGES += x11/library/libxrender +REQUIRED_PACKAGES += x11/library/toolkit/libxaw7 +REQUIRED_PACKAGES += x11/library/toolkit/libxt diff -r 60344306d223 -r 30b42c38bbc4 components/graphviz/resolve.deps --- a/components/graphviz/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -image/graphviz -image/library/libjpeg -image/library/librsvg -image/library/libpng -library/desktop/atk -library/desktop/cairo -library/desktop/gdk-pixbuf -library/desktop/gtk2 -library/desktop/pango -library/expat -library/gd -library/glib2 -library/libtool/libltdl -library/zlib -print/filter/ghostscript -runtime/lua -runtime/perl-516 -runtime/ruby-19 -runtime/tk-8 -shell/ksh93 -system/library -system/library/c++-runtime -system/library/fontconfig -system/library/freetype-2 -system/library/math -system/linker -x11/library/libx11 -x11/library/libxcursor -x11/library/libxmu -x11/library/libxrender -x11/library/toolkit/libxaw7 -x11/library/toolkit/libxt diff -r 60344306d223 -r 30b42c38bbc4 components/groff/Makefile --- a/components/groff/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/groff/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 8829 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # The grog.sh script needs GNU awk not the Solaris one. COMPONENT_PRE_CONFIGURE_ACTION = \ @@ -101,6 +101,16 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/perl-516 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += text/gawk +REQUIRED_PACKAGES += x11/library/libx11 +REQUIRED_PACKAGES += x11/library/libxmu +REQUIRED_PACKAGES += x11/library/toolkit/libxaw7 +REQUIRED_PACKAGES += x11/library/toolkit/libxt diff -r 60344306d223 -r 30b42c38bbc4 components/groff/resolve.deps --- a/components/groff/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -runtime/perl-512 -runtime/perl-516 -shell/ksh93 -system/core-os -system/library -system/library/c++-runtime -system/library/math -text/gawk -x11/library/libx11 -x11/library/libxmu -x11/library/toolkit/libxaw7 -x11/library/toolkit/libxt diff -r 60344306d223 -r 30b42c38bbc4 components/gtar/Makefile --- a/components/gtar/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/gtar/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 16886 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # workaround for CR 6998994 sparc_COPTFLAG = -xO2 @@ -63,6 +63,9 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += compress/bzip2 +REQUIRED_PACKAGES += compress/gzip +REQUIRED_PACKAGES += network/ssh +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/gtar/resolve.deps --- a/components/gtar/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -compress/bzip2 -compress/gzip -network/ssh -system/core-os -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/guile/Makefile --- a/components/guile/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/guile/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,6 +20,10 @@ # # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # + +# Built in SFW with gcc and builds cleanly now only with gcc +COMPILER = gcc + include ../../make-rules/shared-macros.mk COMPONENT_NAME= guile @@ -34,12 +38,10 @@ TPNO= 8939 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk -# Built in SFW with gcc and builds cleanly now only with gcc -COMPILER = gcc CONFIGURE_OPTIONS += CPPFLAGS="-I/usr/include/gmp -D__USE_LEGACY_PROTOTYPES__" CONFIGURE_OPTIONS += --disable-static CONFIGURE_OPTIONS += --disable-error-on-warning @@ -69,6 +71,13 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/gmp +REQUIRED_PACKAGES += library/libtool/libltdl +REQUIRED_PACKAGES += library/ncurses +REQUIRED_PACKAGES += library/readline +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/gcc-3-runtime +REQUIRED_PACKAGES += system/library/gcc-45-runtime +REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/guile/resolve.deps --- a/components/guile/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -library/gmp -library/libtool/libltdl -library/ncurses -library/readline -shell/ksh93 -system/library -system/library/gcc-3-runtime -system/library/gcc-45-runtime -system/library/gcc/gcc-c-runtime -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/gutenprint/Makefile --- a/components/gutenprint/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/gutenprint/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -34,9 +34,9 @@ TPNO= 8943 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_ENV += CFLAGS="$(CFLAGS)" CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR) @@ -64,7 +64,18 @@ # the tests mostly pass, but it can't find several drivers for ppd files test: $(TEST_32) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/desktop/gtk2 +REQUIRED_PACKAGES += library/glib2 +REQUIRED_PACKAGES += library/print/cups-libs +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += print/cups +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/perl-516 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += x11/library/libx11 +REQUIRED_PACKAGES += x11/library/libxcursor diff -r 60344306d223 -r 30b42c38bbc4 components/gutenprint/resolve.deps --- a/components/gutenprint/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -library/desktop/gtk2 -library/glib2 -library/print/cups-libs -library/zlib -runtime/perl-512 -runtime/perl-516 -shell/ksh93 -system/library -system/library/math -system/linker -x11/library/libx11 -x11/library/libxcursor diff -r 60344306d223 -r 30b42c38bbc4 components/gzip/Makefile --- a/components/gzip/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/gzip/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 17904 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # To get correct @bindir@ substitution in the various gz scripts. CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin @@ -96,6 +96,9 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += runtime/python-27 +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/xopen/xcu4 diff -r 60344306d223 -r 30b42c38bbc4 components/gzip/resolve.deps --- a/components/gzip/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -shell/bash -system/library -system/xopen/xcu4 -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/hal-cups-utils/Makefile --- a/components/hal-cups-utils/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/hal-cups-utils/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -19,7 +19,7 @@ # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 8957 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PATCH_LEVEL = 0 USED_PYTHON=$(PYTHON.2.6.32) @@ -66,6 +66,9 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/print/cups-libs +REQUIRED_PACKAGES += print/cups +REQUIRED_PACKAGES += system/hal +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/libdbus diff -r 60344306d223 -r 30b42c38bbc4 components/hal-cups-utils/resolve.deps --- a/components/hal-cups-utils/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -library/print/cups-libs -system/hal -system/library -system/library/libdbus diff -r 60344306d223 -r 30b42c38bbc4 components/hexedit/Makefile --- a/components/hexedit/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/hexedit/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 18059 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = \ ($(CLONEY) $(SOURCE_DIR) $(@D)) @@ -64,7 +64,7 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) +TPNO= 9060 -include ../../make-rules/depend.mk -TPNO= 9060 +REQUIRED_PACKAGES += library/ncurses +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/hexedit/resolve.deps --- a/components/hexedit/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -library/ncurses -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/hplip/Makefile --- a/components/hplip/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/hplip/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -19,7 +19,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ COMPONENT_ARCHIVE_URL= http://sourceforge.net/projects/hplip/files/hplip/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= utility/hplip -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Enable ASLR for this component ASLR_MODE = $(ASLR_ENABLE) @@ -90,8 +90,6 @@ $(HPLIP_VARIANT)/.built: COMPONENT_PREP_ACTION = \ (cd $(@D) ; autoconf ) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - # # Since it looks like you can't build HPLIP with both HPIJS and CUPS support # and seperate the HPIJS and CUPS PPD data, we need to replicate the code and @@ -115,4 +113,17 @@ # empty test target test: $(NO_TESTS) -include ../../make-rules/depend.mk + +REQUIRED_PACKAGES += image/library/libjpeg +REQUIRED_PACKAGES += library/print/cups-libs +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += print/cups +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/libdbus +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/library/usb/libusb +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += system/management/snmp/net-snmp diff -r 60344306d223 -r 30b42c38bbc4 components/hplip/resolve.deps --- a/components/hplip/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -image/library/libjpeg -library/print/cups-libs -library/security/openssl -runtime/perl-512 -runtime/python-26 -system/library -system/library/c++-runtime -system/library/libdbus -system/library/math -system/library/usb/libusb -system/linker -system/management/snmp/net-snmp diff -r 60344306d223 -r 30b42c38bbc4 components/httping/Makefile --- a/components/httping/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/httping/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 9238 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk CC += $(CC_BITS) @@ -57,6 +57,6 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/httping/resolve.deps --- a/components/httping/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -library/security/openssl -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/hwdata/Makefile --- a/components/hwdata/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/hwdata/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -28,7 +28,7 @@ TPNO_PCI= 7530 TPNO_USB= 7831 -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/ips.mk # Since upstream only offers the latest snapshot for download, without # any way to retrieve a specific version, we just keep the currently @@ -60,9 +60,6 @@ PKG_MACROS += $(foreach i,$(ID_FILES),\ COMPONENT_VERSION_$(i)='$(shell $(ID_VERSION_EXTRACT_COMMAND) $(i))') -# This package delivers only data files and has no dependencies. -EXTDEPFILES = $(NULLDEPFILE) - # Since we have two separately licensed components we don't use the default # license transform rules, but handle the license info metadata directly LICENSE_TRANSFORMS = @@ -106,4 +103,3 @@ clobber clean:: $(RM) -r $(BUILD_DIR) -include ../../make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/iftop/Makefile --- a/components/iftop/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/iftop/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 9256 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = \ ($(CLONEY) $(SOURCE_DIR) $(@D)) @@ -69,6 +69,8 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/ncurses +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/libpcap +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/iftop/resolve.deps --- a/components/iftop/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -library/ncurses -system/library -system/library/libpcap -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/ilmbase/Makefile --- a/components/ilmbase/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/ilmbase/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 5574 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PATCH_LEVEL = 0 @@ -70,6 +70,7 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/ilmbase/resolve.deps --- a/components/ilmbase/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -system/library -system/library/c++-runtime -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/imagemagick/Makefile --- a/components/imagemagick/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/imagemagick/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -39,9 +39,9 @@ TPNO= 17708 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin @@ -123,6 +123,25 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES= $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += compress/bzip2 +REQUIRED_PACKAGES += compress/xz +REQUIRED_PACKAGES += image/library/libjpeg +REQUIRED_PACKAGES += image/library/libpng +REQUIRED_PACKAGES += image/library/libtiff +REQUIRED_PACKAGES += library/desktop/cairo +REQUIRED_PACKAGES += library/desktop/pango +REQUIRED_PACKAGES += library/fftw-3 +REQUIRED_PACKAGES += library/glib2 +REQUIRED_PACKAGES += library/lcms +REQUIRED_PACKAGES += library/libtool/libltdl +REQUIRED_PACKAGES += library/libxml2 +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/fontconfig +REQUIRED_PACKAGES += system/library/freetype-2 +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/library/openmp +REQUIRED_PACKAGES += x11/library/libx11 +REQUIRED_PACKAGES += x11/library/libxext diff -r 60344306d223 -r 30b42c38bbc4 components/imagemagick/resolve.deps --- a/components/imagemagick/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -compress/bzip2 -compress/xz -image/library/libjpeg -image/library/libpng -image/library/libtiff -library/desktop/cairo -library/desktop/pango -library/fftw-3 -library/glib2 -library/lcms -library/libtool/libltdl -library/libxml2 -library/zlib -shell/ksh93 -system/library -system/library/c++-runtime -system/library/fontconfig -system/library/freetype-2 -system/library/math -system/library/openmp -x11/library/libx11 -x11/library/libxext diff -r 60344306d223 -r 30b42c38bbc4 components/indent/Makefile --- a/components/indent/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/indent/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -19,7 +19,7 @@ # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 12225 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Needed to get "gmake test" working. COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D)) @@ -62,6 +62,5 @@ test: install $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/indent/resolve.deps --- a/components/indent/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/indri/Makefile --- a/components/indri/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/indri/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,9 +20,11 @@ # # -# Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # +COMPILER = gcc + include ../../make-rules/shared-macros.mk COMPONENT_NAME = indri @@ -37,12 +39,11 @@ TPNO= 13668 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = $(CLONEY) $(SOURCE_DIR) $(@D) -COMPILER = gcc CONFIGURE_OPTIONS += "CFLAGS=$(CFLAGS)" CONFIGURE_OPTIONS += "CXXFLAGS=$(CXXFLAGS)" CONFIGURE_OPTIONS += "LDFLAGS=$(LDFLAGS)" @@ -73,6 +74,11 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += developer/lexer/flex +REQUIRED_PACKAGES += developer/parser/bison +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime +REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/indri/resolve.deps --- a/components/indri/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -library/zlib -system/library -system/library/gcc/gcc-c++-runtime -system/library/gcc/gcc-c-runtime -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/iperf/Makefile --- a/components/iperf/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/iperf/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 5730 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = \ ($(CLONEY) $(SOURCE_DIR) $(@D)) @@ -64,6 +64,7 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/iperf/resolve.deps --- a/components/iperf/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -system/library -system/library/c++-runtime -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/ircii/Makefile --- a/components/ircii/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/ircii/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -38,9 +38,9 @@ TPNO= 12675 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Needed to correctly include and when compiling the # various C source files. @@ -81,6 +81,5 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/ircii/resolve.deps --- a/components/ircii/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/isc-dhcp/Makefile --- a/components/isc-dhcp/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/isc-dhcp/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 10383 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = \ ($(CLONEY) $(SOURCE_DIR) $(@D)) @@ -63,11 +63,13 @@ install: build $(INSTALL_32) $(PROTO_DIR)/dhcpd.leases -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - test: $(TEST_32) $(PROTO_DIR)/dhcpd.leases: $(INSTALL_32) $(TOUCH) $@ -include ../../make-rules/depend.mk + +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/network diff -r 60344306d223 -r 30b42c38bbc4 components/isc-dhcp/resolve.deps --- a/components/isc-dhcp/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -shell/ksh93 -system/core-os -system/library -system/network diff -r 60344306d223 -r 30b42c38bbc4 components/jansson/Makefile --- a/components/jansson/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/jansson/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,10 +34,10 @@ TPNO= 19403 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk LINT_FLAGS += -I$(PROTOUSRINCDIR) @@ -58,6 +58,5 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/jansson/resolve.deps --- a/components/jansson/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/jsl/Makefile --- a/components/jsl/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/jsl/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,8 +18,14 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # + +# Preferred compiler set to gcc and not Studio as on Sparc architecture +# some assembler code is required for locking which fails to compile on +# solaris, when using gcc this is inlined (see jslock.c) +COMPILER = gcc + include ../../make-rules/shared-macros.mk COMPONENT_NAME= jsl @@ -34,14 +40,9 @@ TPNO= 10774 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk - -# Preferred compiler set to gcc and not Studio as on Sparc architecture -# some assembler code is required for locking which fails to compile on -# solaris, when using gcc this is inlined (see jslock.c) -COMPILER = gcc +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_BUILD_ARGS += -f src/Makefile COMPONENT_BUILD_ARGS += CC="$(CC)" @@ -67,6 +68,6 @@ test: install $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/jsl/resolve.deps --- a/components/jsl/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/junit/Makefile --- a/components/junit/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/junit/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 9070 -include ../../make-rules/prep.mk -include ../../make-rules/ant.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ant.mk +include $(WS_MAKE_RULES)/ips.mk # These ARGS override what is set in build.xml COMPONENT_BUILD_ARGS += -Ddist=${PROTO_DIR} @@ -61,6 +61,5 @@ # OK (22 tests) test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += runtime/java/jre-7 diff -r 60344306d223 -r 30b42c38bbc4 components/junit/resolve.deps --- a/components/junit/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -runtime/java/jre-7 diff -r 60344306d223 -r 30b42c38bbc4 components/ksh93/Makefile --- a/components/ksh93/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/ksh93/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -156,11 +156,13 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES= $(BUILD_TOOLS) - PKG_PROTO_DIRS += $(COMPONENT_DIR)/files -include ../../make-rules/prep.mk -include ../../make-rules/attpackagemake.mk -include ../../make-rules/ips.mk -include ../../make-rules/depend.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/attpackagemake.mk +include $(WS_MAKE_RULES)/ips.mk + +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/library/security/crypto diff -r 60344306d223 -r 30b42c38bbc4 components/ksh93/resolve.deps --- a/components/ksh93/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -system/core-os -system/library -system/library/math -system/library/security/crypto diff -r 60344306d223 -r 30b42c38bbc4 components/lcms/Makefile --- a/components/lcms/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/lcms/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,10 +34,10 @@ TPNO= 9072 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk PATCH_LEVEL = 0 @@ -100,6 +100,12 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += image/library/libjpeg +REQUIRED_PACKAGES += image/library/libtiff +REQUIRED_PACKAGES += library/lcms +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += runtime/python-27 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/lcms/resolve.deps --- a/components/lcms/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -image/library/libjpeg -image/library/libtiff -library/lcms -runtime/python-26 -runtime/python-27 -system/library -system/library/c++-runtime -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/less/Makefile --- a/components/less/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/less/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 9286 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CC += $(CC_BITS) @@ -58,6 +58,6 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/ncurses +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/less/resolve.deps --- a/components/less/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -library/ncurses -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/lftp/Makefile --- a/components/lftp/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/lftp/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 16991 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PATCH_LEVEL = 0 @@ -58,6 +58,13 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/expat +REQUIRED_PACKAGES += library/gnutls +REQUIRED_PACKAGES += library/readline +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/perl-516 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/lftp/resolve.deps --- a/components/lftp/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -library/expat -library/gnutls -library/readline -runtime/perl-512 -runtime/perl-516 -shell/ksh93 -system/library -system/library/c++-runtime -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/libarchive/Makefile --- a/components/libarchive/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libarchive/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -35,9 +35,9 @@ TPNO= 11624 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Userland default includes -mt which links with libthread which we don't need. studio_MT = @@ -65,6 +65,10 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += compress/bzip2 +REQUIRED_PACKAGES += compress/xz +REQUIRED_PACKAGES += library/libxml2 +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libarchive/resolve.deps --- a/components/libarchive/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -compress/bzip2 -compress/xz -library/libxml2 -library/security/openssl -library/zlib -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libassuan/Makefile --- a/components/libassuan/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libassuan/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 18558 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Enable C99 mode + -Xc for its additional warnings. studio_C99MODE = -Xc $(studio_C99_ENABLE) @@ -73,7 +73,8 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) + -include ../../make-rules/depend.mk - +REQUIRED_PACKAGES += library/security/libgpg-error +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libassuan/resolve.deps --- a/components/libassuan/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -library/security/libgpg-error -shell/ksh93 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libconfuse/Makefile --- a/components/libconfuse/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libconfuse/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -35,9 +35,9 @@ TPNO= 6306 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += --disable-static CONFIGURE_OPTIONS += --enable-shared @@ -67,6 +67,4 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libconfuse/resolve.deps --- a/components/libconfuse/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libdnet/Makefile --- a/components/libdnet/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libdnet/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 9402 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Needed to generate libraries with a .so extension. COMPONENT_PREP_ACTION = \ @@ -71,6 +71,6 @@ test: $(NO_TESTS) #test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libdnet/resolve.deps --- a/components/libdnet/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -shell/ksh93 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libedit/Makefile --- a/components/libedit/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libedit/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -35,9 +35,9 @@ TPNO= 7013 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" CONFIGURE_OPTIONS += --enable-shared @@ -55,6 +55,5 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libedit/resolve.deps --- a/components/libedit/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libee/Makefile --- a/components/libee/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libee/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -33,9 +33,9 @@ TPNO= 7585 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Userland default includes -mt which links with libthread which we don't need. studio_MT = @@ -54,6 +54,6 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/libestr +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libee/resolve.deps --- a/components/libee/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -library/libestr -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libestr/Makefile --- a/components/libestr/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libestr/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -33,9 +33,9 @@ TPNO= 7585 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Userland default includes -mt which links with libthread which we don't need. studio_MT = @@ -54,6 +54,5 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libestr/resolve.deps --- a/components/libestr/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libevent/Makefile --- a/components/libevent/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libevent/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -38,10 +38,10 @@ TPNO= 5581 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk COMPONENT_PRE_CONFIGURE_ACTION = \ ($(CLONEY) $(SOURCE_DIR) $(@D)) @@ -76,6 +76,5 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libevent/resolve.deps --- a/components/libevent/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libexpat/Makefile --- a/components/libexpat/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libexpat/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ TPNO= 5498 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS) $(CPP_LARGEFILES)" CONFIGURE_OPTIONS += CXXFLAGS="$(CXXFLAGS)" @@ -57,6 +57,5 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libexpat/resolve.deps --- a/components/libexpat/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libidn/Makefile --- a/components/libidn/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libidn/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -41,10 +41,10 @@ TPNO= 8441 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk PATCH_LEVEL = 0 LINT_FLAGS += -I$(PROTOUSRINCDIR)/idn @@ -140,6 +140,5 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libidn/resolve.deps --- a/components/libidn/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libksba/Makefile --- a/components/libksba/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libksba/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 8768 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Enable C99 mode + -Xc for its additional warnings. studio_C99MODE = -Xc $(studio_C99_ENABLE) @@ -73,6 +73,7 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/security/libgpg-error +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libksba/resolve.deps --- a/components/libksba/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -library/security/libgpg-error -shell/ksh93 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libmcrypt/Makefile --- a/components/libmcrypt/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libmcrypt/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -19,7 +19,7 @@ # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 8771 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CFLAGS += -xstrconst LDFLAGS += -lsocket -lnsl @@ -79,6 +79,6 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libmcrypt/resolve.deps --- a/components/libmcrypt/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -shell/ksh93 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libmemcached/Makefile --- a/components/libmemcached/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libmemcached/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -19,7 +19,7 @@ # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 5582 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CFLAGS += -xstrconst LDFLAGS += -lsocket -lnsl @@ -88,6 +88,5 @@ # Tests fail, probably because memcached is not running. test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libmemcached/resolve.deps --- a/components/libmemcached/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libmicrohttpd/Makefile --- a/components/libmicrohttpd/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libmicrohttpd/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -34,10 +34,10 @@ TPNO = 18422 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk LINT_FLAGS += -I$(PROTOUSRINCDIR) @@ -63,6 +63,4 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libmicrohttpd/resolve.deps --- a/components/libmicrohttpd/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libmng/Makefile --- a/components/libmng/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libmng/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -58,10 +58,10 @@ TPNO= 5583 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk # because Solaris installed the lcms headers elsewhere CFLAGS += `pkg-config --cflags lcms` @@ -108,6 +108,9 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += image/library/libjpeg +REQUIRED_PACKAGES += library/lcms +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/libmng/resolve.deps --- a/components/libmng/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -image/library/libjpeg -library/lcms -library/zlib -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/libneon/Makefile --- a/components/libneon/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libneon/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -35,9 +35,9 @@ TPNO= 18538 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PATCH_LEVEL = 0 @@ -74,7 +74,12 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) + -include ../../make-rules/depend.mk - +REQUIRED_PACKAGES += library/libproxy +REQUIRED_PACKAGES += library/libxml2 +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/security/gss diff -r 60344306d223 -r 30b42c38bbc4 components/libneon/resolve.deps --- a/components/libneon/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -library/libproxy -library/libxml2 -library/security/openssl -library/zlib -shell/ksh93 -system/library -system/library/security/gss diff -r 60344306d223 -r 30b42c38bbc4 components/libnet/Makefile --- a/components/libnet/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libnet/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,9 +20,11 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # +COMPILER = gcc + include ../../make-rules/shared-macros.mk COMPONENT_NAME= libnet @@ -37,15 +39,14 @@ TPNO= 17724 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = \ ($(CLONEY) $(SOURCE_DIR) $(@D)) PKG_PROTO_DIRS += $(COMPONENT_SRC)/doc/man/man3 -COMPILER = gcc CFLAGS += -g -fPIC CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" CONFIGURE_OPTIONS.32 += --srcdir=$(BUILD_DIR_32) @@ -62,6 +63,10 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/gcc-3-runtime +REQUIRED_PACKAGES += system/library/gcc-45-runtime +REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime +REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime diff -r 60344306d223 -r 30b42c38bbc4 components/libnet/resolve.deps --- a/components/libnet/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -shell/ksh93 -system/library -system/library/gcc-3-runtime -system/library/gcc-45-runtime -system/library/gcc/gcc-c-runtime -system/library/gcc/gcc-c++-runtime diff -r 60344306d223 -r 30b42c38bbc4 components/libpcap/Makefile --- a/components/libpcap/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libpcap/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 15968 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # # libpcap Makefile does not use CFLAGS when building shared library @@ -55,8 +55,10 @@ install: $(INSTALL_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - test: $(NO_TESTS) -include ../../make-rules/depend.mk + +REQUIRED_PACKAGES += developer/lexer/flex +REQUIRED_PACKAGES += developer/parser/bison +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libpcap/resolve.deps --- a/components/libpcap/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -shell/ksh93 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/librsync/Makefile --- a/components/librsync/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/librsync/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -48,9 +48,9 @@ CLOBBER_PATHS += $(COMPONENT_NAME_1) -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = \ ($(CLONEY) $(SOURCE_DIR) $(@D)) ; \ @@ -89,6 +89,6 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/popt +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/librsync/resolve.deps --- a/components/librsync/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -library/popt -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libsigsegv/Makefile --- a/components/libsigsegv/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libsigsegv/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 8453 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += --disable-static CONFIGURE_OPTIONS += --enable-shared @@ -53,6 +53,5 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libsigsegv/resolve.deps --- a/components/libsigsegv/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libsndfile/Makefile --- a/components/libsndfile/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libsndfile/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -34,9 +34,9 @@ TPNO= 8890 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Needed for __func__ in cpp_test.cc CXXFLAGS += $(studio_FEATURES_EXTENSIONS) @@ -65,6 +65,9 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += codec/flac +REQUIRED_PACKAGES += codec/ogg-vorbis +REQUIRED_PACKAGES += database/sqlite-3 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/libsndfile/resolve.deps --- a/components/libsndfile/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -codec/flac -codec/ogg-vorbis -database/sqlite-3 -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/libssh2/Makefile --- a/components/libssh2/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libssh2/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -34,9 +34,9 @@ TPNO= 11357 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" CONFIGURE_OPTIONS += --enable-shared @@ -71,6 +71,6 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libssh2/resolve.deps --- a/components/libssh2/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -library/security/openssl -library/zlib -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libtecla/Makefile --- a/components/libtecla/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libtecla/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,10 +34,10 @@ TPNO= 8740 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk # Userland default includes -mt which links with libthread which we don't need. studio_MT = @@ -59,8 +59,7 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - PKG_PROTO_DIRS += $(COMPONENT_DIR)/files -include ../../make-rules/depend.mk + +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libtecla/resolve.deps --- a/components/libtecla/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/libtool/Makefile --- a/components/libtool/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libtool/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -48,9 +48,9 @@ COMPONENT_ARCHIVE_URL_1 = http://ftp.gnu.org/gnu/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE_1) SOURCE_DIR_1 = $(COMPONENT_DIR)/$(COMPONENT_SRC_1) -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR) CONFIGURE_OPTIONS += --disable-static @@ -89,7 +89,7 @@ $(BUILD_DIR_64)/.installed: $(BUILD_OLD_DIR_64)/.installed # we need to prep the old version too (this should be handled in prep.mk) -$(SOURCE_DIR_1)/.unpacked: download Makefile $(PATCHES) +$(SOURCE_DIR_1)/.unpacked: download $(MAKEFILE_PREREQ) $(PATCHES) $(RM) -r $(SOURCE_DIR_1) $(UNPACK) $(UNPACK_ARGS) $(COMPONENT_ARCHIVE_1) $(TOUCH) $@ @@ -115,6 +115,12 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += developer/base-developer-utilities +REQUIRED_PACKAGES += file/gnu-coreutils +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += text/gnu-grep +REQUIRED_PACKAGES += text/gnu-sed diff -r 60344306d223 -r 30b42c38bbc4 components/libtool/resolve.deps --- a/components/libtool/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -developer/base-developer-utilities -file/gnu-coreutils -shell/bash -shell/ksh93 -system/library -system/linker -text/gnu-grep -text/gnu-sed diff -r 60344306d223 -r 30b42c38bbc4 components/libtorrent/Makefile --- a/components/libtorrent/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libtorrent/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -41,9 +41,9 @@ TPNO= 9038 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = \ ($(CLONEY) $(SOURCE_DIR) $(@D)) @@ -89,6 +89,7 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/c++/sigcpp +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime diff -r 60344306d223 -r 30b42c38bbc4 components/libtorrent/resolve.deps --- a/components/libtorrent/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -library/c++/sigcpp -library/security/openssl -system/library -system/library/c++-runtime diff -r 60344306d223 -r 30b42c38bbc4 components/libusb/ugen/Makefile --- a/components/libusb/ugen/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libusb/ugen/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -29,8 +29,8 @@ COMPONENT_SRC= src COMPONENT_BUGDB= library/libusb -include $(WS_TOP)/make-rules/justmake.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk $(BUILD_DIR_32)/.built: BITS=32 $(BUILD_DIR_64)/.built: BITS=64 @@ -45,7 +45,7 @@ ASLR_MODE = $(ASLR_NOT_APPLICABLE) -download: +download:: clobber: clean $(RM) $(SOURCE_DIR)/.prep @@ -63,6 +63,7 @@ # enumerates USB devices plugged into your system test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += system/io/usb +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/libusb/ugen/resolve.deps --- a/components/libusb/ugen/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -system/library -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/libusb/wrapper/Makefile --- a/components/libusb/wrapper/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libusb/wrapper/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -31,8 +31,8 @@ TPNO= 9184 -include $(WS_TOP)/make-rules/justmake.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk $(BUILD_DIR_32)/.built: BITS=32 $(BUILD_DIR_64)/.built: BITS=64 @@ -51,7 +51,7 @@ $(BUILD_DIR)/libusb-64.pc: src/libusb-64.pc /bin/sed -e "s#MACH64#$(MACH64)#g" <$< >$@ -download: +download:: clobber: clean $(RM) $(SOURCE_DIR)/.prep @@ -65,6 +65,7 @@ # enumerates USB devices plugged into your system test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/libusb/wrapper/resolve.deps --- a/components/libusb/wrapper/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -shell/ksh93 -system/library -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/libxml2/Makefile --- a/components/libxml2/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libxml2/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -43,10 +43,10 @@ TPNO= 19552 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk ASLR_MODE = $(ASLR_ENABLE) @@ -128,6 +128,13 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/libxml2 +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += runtime/python-27 +REQUIRED_PACKAGES += runtime/python-34 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/libxml2/resolve.deps --- a/components/libxml2/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -library/libxml2 -library/zlib -runtime/python-26 -runtime/python-27 -runtime/python-34 -shell/ksh93 -system/library -system/library/math -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/libxslt/Makefile --- a/components/libxslt/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/libxslt/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,10 +37,10 @@ TPNO= 17982 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk ASLR_MODE = $(ASLR_ENABLE) @@ -93,6 +93,11 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/libxml2 +REQUIRED_PACKAGES += library/libxslt +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/libxslt/resolve.deps --- a/components/libxslt/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -library/libxml2 -library/libxslt -runtime/python-26 -shell/ksh93 -system/library -system/library/math -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/lighttpd/Makefile --- a/components/lighttpd/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/lighttpd/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ LIGHTTPD_INSTALLDIR=/usr/lighttpd/1.4 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PATCH_LEVEL=0 @@ -80,6 +80,17 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += compress/bzip2 +REQUIRED_PACKAGES += database/mysql-55 +REQUIRED_PACKAGES += database/mysql-55/library +REQUIRED_PACKAGES += library/openldap +REQUIRED_PACKAGES += library/pcre +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/security/openssl/openssl-fips-140 +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += runtime/lua +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/network +REQUIRED_PACKAGES += web/fastcgi/spawn-fcgi diff -r 60344306d223 -r 30b42c38bbc4 components/lighttpd/resolve.deps --- a/components/lighttpd/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -compress/bzip2 -database/mysql-55/library -library/openldap -library/pcre -library/security/openssl -library/security/openssl/openssl-fips-140 -library/zlib -runtime/lua -system/core-os -system/library -system/network -web/fastcgi/spawn-fcgi diff -r 60344306d223 -r 30b42c38bbc4 components/links/Makefile --- a/components/links/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/links/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,6 +20,10 @@ # # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # + +# Because the Studio compiler generates thousands of lines of warnings. +COMPILER = gcc + include ../../make-rules/shared-macros.mk COMPONENT_NAME= links @@ -34,12 +38,9 @@ TPNO= 21157 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk - -# Because the Studio compiler generates thousands of lines of warnings. -COMPILER = gcc +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Needed to generate a 64-bit executable. CC += $(CC_BITS) @@ -61,6 +62,11 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += compress/bzip2 +REQUIRED_PACKAGES += compress/xz +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/linker + diff -r 60344306d223 -r 30b42c38bbc4 components/links/resolve.deps --- a/components/links/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -compress/bzip2 -compress/xz -library/security/openssl -library/zlib -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/logilab-astng/Makefile --- a/components/logilab-astng/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/logilab-astng/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -41,9 +41,9 @@ # this likewise. PYTHON_VERSIONS= 2.7 2.6 -include ../../make-rules/prep.mk -include ../../make-rules/ips.mk -include ../../make-rules/setup.py.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/setup.py.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -92,6 +92,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/logilab-astng/resolve.deps --- a/components/logilab-astng/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/logilab-common/Makefile --- a/components/logilab-common/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/logilab-common/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -40,9 +40,9 @@ # Syntax issues: not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include ../../make-rules/prep.mk -include ../../make-rules/ips.mk -include ../../make-rules/setup.py.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/setup.py.mk # rename pytest to its versioned name; mediated links (depending on # the python version) in the manifest will create the link from pytest @@ -81,6 +81,5 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/python-2/pyorbit-26 diff -r 60344306d223 -r 30b42c38bbc4 components/logilab-common/resolve.deps --- a/components/logilab-common/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -library/python-2/pyorbit-26 -library/python/pyorbit-26 -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/lua/Makefile --- a/components/lua/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/lua/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -40,9 +40,9 @@ TPNO= 5814 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk PATCH_LEVEL= 0 @@ -102,6 +102,5 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/lua/resolve.deps --- a/components/lua/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/lynx/Makefile --- a/components/lynx/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/lynx/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -34,9 +34,9 @@ TPNO= 9373 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Needed to successfully find lynx.pot. COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D)) @@ -71,6 +71,7 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/ncurses +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/security/openssl/openssl-fips-140 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/lynx/resolve.deps --- a/components/lynx/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -library/ncurses -library/security/openssl -library/security/openssl/openssl-fips-140 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/m4/Makefile --- a/components/m4/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/m4/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -37,9 +37,9 @@ TPNO= 16962 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_PREFIX = /usr/gnu CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR) @@ -61,6 +61,7 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/libsigsegv +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/m4/resolve.deps --- a/components/m4/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -library/libsigsegv -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/mailman/Makefile --- a/components/mailman/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/mailman/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 18736 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_ENV += MAILMAN_USER=mailman CONFIGURE_ENV += MAILMAN_GROUP=mailman @@ -62,8 +62,12 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - PKG_PROTO_DIRS += $(COMPONENT_DIR)/files -include ../../make-rules/depend.mk + +REQUIRED_PACKAGES += library/python/dnspython-27 +REQUIRED_PACKAGES += runtime/python-27 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/network diff -r 60344306d223 -r 30b42c38bbc4 components/mailman/resolve.deps --- a/components/mailman/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/python/dnspython-27 -runtime/python-27 -shell/ksh93 -system/core-os -system/library -system/network diff -r 60344306d223 -r 30b42c38bbc4 components/make/Makefile --- a/components/make/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/make/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 5521 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin @@ -58,6 +58,5 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/make/resolve.deps --- a/components/make/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/mc/Makefile --- a/components/mc/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/mc/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 20604 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += --sysconfdir=/usr/share @@ -64,6 +64,10 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/glib2 +REQUIRED_PACKAGES += library/slang +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/perl-516 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/mc/resolve.deps --- a/components/mc/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/glib2 -library/slang -runtime/perl-512 -runtime/perl-516 -shell/ksh93 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/meld/Makefile --- a/components/meld/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/meld/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -35,9 +35,9 @@ TPNO= 16990 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk # Meld has no configure however it honors DESTDIR which is necessary so # we don't try to install into roots /usr but rather our proto areas usr @@ -52,6 +52,8 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += developer/gnome/gettext +REQUIRED_PACKAGES += library/python-2/pygtk2-26 +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += text/gnu-gettext diff -r 60344306d223 -r 30b42c38bbc4 components/meld/resolve.deps --- a/components/meld/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -library/python-2/pygtk2-26 -library/python/pygtk2-26 -runtime/python-26 diff -r 60344306d223 -r 30b42c38bbc4 components/memcached-java/Makefile --- a/components/memcached-java/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/memcached-java/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -19,7 +19,7 @@ # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 5586 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/ant.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ant.mk +include $(WS_MAKE_RULES)/ips.mk # Make sure we remove unneeded pieces from the source (the test dir) # and also the existing source files which will be generated anew @@ -82,6 +82,5 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += runtime/java/jre-7 diff -r 60344306d223 -r 30b42c38bbc4 components/memcached-java/resolve.deps --- a/components/memcached-java/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -runtime/java/jre-7 diff -r 60344306d223 -r 30b42c38bbc4 components/memcached/Makefile --- a/components/memcached/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/memcached/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 16265 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PATH=/usr/bin:/usr/gnu/bin:/usr/perl5/bin @@ -75,6 +75,9 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/libevent +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/network diff -r 60344306d223 -r 30b42c38bbc4 components/memcached/resolve.deps --- a/components/memcached/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -library/libevent -shell/ksh93 -system/core-os -system/library -system/network diff -r 60344306d223 -r 30b42c38bbc4 components/mercurial/Makefile --- a/components/mercurial/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/mercurial/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -43,9 +43,9 @@ # Mercurial does not yet support Python 3. PYTHON_VERSIONS = 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_POST_INSTALL_ACTION = \ (cd $(PROTO_DIR)/usr/bin ; $(MV) -f hg hg-$(PYTHON_VERSION)) @@ -101,6 +101,5 @@ test: install $(TEST_32) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/mercurial/resolve.deps --- a/components/mercurial/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/meta-packages/developer-opensolaris-userland/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/meta-packages/developer-opensolaris-userland/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -0,0 +1,57 @@ +# +# 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) 2015, Oracle and/or its affiliates. All rights reserved. +# + +include ../../../make-rules/shared-macros.mk + +COMPONENT_NAME= developer/opensolaris/userland +COMPONENT_VERSION= +COMPONENT_PROJECT_URL= http://solaris-userland.java.net/ +COMPONENT_ARCHIVE_URL= http://hg.java.net/solaris-userland-gate/ +COMPONENT_BUGDB= gate-stuff/userland + +include $(WS_MAKE_RULES)/ips.mk + +$(WS_MACH)/requires.mk: + (cd $(WS_COMPONENTS) ; $(GMAKE) $@) + +-include $(WS_MACH)/requires.mk + +# The package is created in two parts: the checked-in manifest and a generated +# file of actions based on the REQUIRED_PACKAGES macro value. +PKG_OPTIONS += -I $(BUILD_DIR) + +$(BUILD_DIR)/package.list: $(BUILD_DIR) $(WS_MACH)/requires.mk + @echo $(REQUIRED_PACKAGES:%="depend type=require fmri=pkg:/%\\n") >$@ + +download:: + +prep: + +build install: $(BUILD_DIR)/package.list + +test: $(NO_TESTS) + +clean clobber:: + $(RM) -r $(BUILD_DIR) diff -r 60344306d223 -r 30b42c38bbc4 components/meta-packages/developer-opensolaris-userland/developer-opensolaris-userland.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/meta-packages/developer-opensolaris-userland/developer-opensolaris-userland.p5m Sun Feb 15 19:02:09 2015 -0600 @@ -0,0 +1,32 @@ +# +# 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) 2015, Oracle and/or its affiliates. All rights reserved. + + +# +set name=pkg.fmri \ + value=pkg:/$(COMPONENT_NAME)@$(PKG_SOLARIS_VERSION),$(BUILD_VERSION) +set name=pkg.summary \ + value="Dependencies required to build Userland consolidation." +set name=info.classification \ + value="org.opensolaris.category.2008:Development/Distribution Tools" +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) diff -r 60344306d223 -r 30b42c38bbc4 components/meta-packages/history/Makefile --- a/components/meta-packages/history/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/meta-packages/history/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,12 +18,12 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk -# $(WS_TOP)/make-rules/ips.mk really isn't set up to allow you to bypass all +# $(WS_MAKE_RULES)/ips.mk really isn't set up to allow you to bypass all # the automatic (and lengthy) manifest manipulation that it does, which we # really don't need to do for these static, uninteresting packages. So we just # write a simple set of publication rules to get the packages into the repo. @@ -46,7 +46,8 @@ ASLR_MODE = $(ASLR_NOT_APPLICABLE) -download prep build install: +download:: +prep build install: @echo "nothing to be done for $@" $(BUILD_DIR): diff -r 60344306d223 -r 30b42c38bbc4 components/mlocate/Makefile --- a/components/mlocate/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/mlocate/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 10233 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS.64 += CC="$(CC) -m64" CONFIGURE_OPTIONS += --localstatedir="/var/cache" @@ -62,6 +62,5 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/mlocate/resolve.deps --- a/components/mlocate/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/mpc/Makefile --- a/components/mpc/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/mpc/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 4706 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk export SHELL SHELL=/bin/sh @@ -50,8 +50,6 @@ CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" CONFIGURE_OPTIONS += --disable-static -include ../../make-rules/shared-targets.mk - COMPONENT_TEST_DIR = $(BUILD_DIR)/$(MACH$(BITS))/tests ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -66,6 +64,7 @@ test: install $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/gmp +REQUIRED_PACKAGES += library/mpfr +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/mpc/resolve.deps --- a/components/mpc/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -library/gmp -library/mpfr -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/mpfr/Makefile --- a/components/mpfr/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/mpfr/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -19,7 +19,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -38,10 +38,10 @@ TPNO= 17709 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk CLOBBER_PATHS += libmpfr.pc PATCH_LEVEL = 0 @@ -134,6 +134,6 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/gmp +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/mpfr/resolve.deps --- a/components/mpfr/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -library/gmp -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/mutt/Makefile --- a/components/mutt/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/mutt/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 9259 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" CONFIGURE_OPTIONS += --sysconfdir="$(ETCDIR)/$(COMPONENT_NAME)" @@ -72,6 +72,16 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += data/docbook/docbook-dtds +REQUIRED_PACKAGES += data/docbook/docbook-style-dsssl +REQUIRED_PACKAGES += data/docbook/docbook-style-xsl +REQUIRED_PACKAGES += library/database/gdbm +REQUIRED_PACKAGES += library/libidn +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/slang +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/perl-516 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/library/security/libsasl diff -r 60344306d223 -r 30b42c38bbc4 components/mutt/resolve.deps --- a/components/mutt/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -library/database/gdbm -library/libidn -library/security/openssl -library/slang -runtime/perl-512 -runtime/perl-516 -shell/ksh93 -system/library -system/library/math -system/library/security/libsasl diff -r 60344306d223 -r 30b42c38bbc4 components/mysql-5-5/Makefile --- a/components/mysql-5-5/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/mysql-5-5/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # export PARFAIT_BUILD=no @@ -35,9 +35,9 @@ COMPONENT_PROJECT_URL = http://dev.mysql.com/ COMPONENT_BUGDB = database/mysql -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk # Enable ASLR for this component ASLR_MODE = $(ASLR_ENABLE) @@ -101,6 +101,14 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += developer/build/cmake +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/perl-516 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/network diff -r 60344306d223 -r 30b42c38bbc4 components/mysql-5-5/resolve.deps --- a/components/mysql-5-5/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -library/security/openssl -runtime/perl-512 -runtime/perl-516 -shell/ksh93 -system/core-os -system/library -system/library/math -system/library/c++-runtime -system/network diff -r 60344306d223 -r 30b42c38bbc4 components/mysql-common/Makefile --- a/components/mysql-common/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/mysql-common/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -27,15 +27,18 @@ COMPONENT_PROJECT_URL= http://dev.mysql.com/ COMPONENT_BUGDB= database/mysql -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # ASLR Mode should be set as not applicable ASLR_MODE = $(ASLR_NOT_APPLICABLE) # nothing to download or build; just package -download prep configure build install test: - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) +download:: +prep configure build install test: clobber: clean + +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/network diff -r 60344306d223 -r 30b42c38bbc4 components/mysql-common/resolve.deps --- a/components/mysql-common/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -shell/ksh93 -system/core-os -system/network diff -r 60344306d223 -r 30b42c38bbc4 components/ncftp/Makefile --- a/components/ncftp/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/ncftp/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -38,9 +38,9 @@ TPNO= 9255 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = \ ($(CLONEY) $(SOURCE_DIR) $(@D)) @@ -54,8 +54,6 @@ ASLR_MODE = $(ASLR_ENABLE) -include ../../make-rules/shared-targets.mk - # common targets configure: $(CONFIGURE_64) @@ -63,8 +61,6 @@ install: $(INSTALL_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - test: $(NO_TESTS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/ncftp/resolve.deps --- a/components/ncftp/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/ncurses/Makefile --- a/components/ncurses/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/ncurses/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 5931 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Needed to make "gmake test" work. COMPONENT_PRE_CONFIGURE_ACTION = \ @@ -83,6 +83,6 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/ncurses/resolve.deps --- a/components/ncurses/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -shell/bash -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/net-snmp/Makefile --- a/components/net-snmp/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/net-snmp/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ TPNO= 5702 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CFLAGS += $(studio_C99_ENABLE) CPPFLAGS += "-DFALSE_SHARING_ALIGN=64" @@ -141,3 +141,16 @@ (cd $(@D) ; $(ENV) srcdir=$(@D) $(DOXYGEN) -u $(@D)/doxygen.conf ; \ $(ENV) srcdir=$(@D) $(DOXYGEN) $(@D)/doxygen.conf) $(TOUCH) $@ + +REQUIRED_PACKAGES += developer/documentation-tool/doxygen +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += runtime/python-27 +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/security/pkcs11 +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += system/management/snmp/net-snmp +REQUIRED_PACKAGES += system/network diff -r 60344306d223 -r 30b42c38bbc4 components/net-snmp/resolve.deps --- a/components/net-snmp/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -runtime/perl-512 -runtime/python-26 -runtime/python-27 -shell/bash -shell/ksh93 -system/core-os -system/library -system/linker -system/management/snmp/net-snmp -system/network -system/library/security/pkcs11 diff -r 60344306d223 -r 30b42c38bbc4 components/nethack/Makefile --- a/components/nethack/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/nethack/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ TPNO= 9239 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk PATCH_LEVEL=0 @@ -70,6 +70,11 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += x11/compatibility/links-xorg +REQUIRED_PACKAGES += x11/library/libx11 +REQUIRED_PACKAGES += x11/library/libxpm +REQUIRED_PACKAGES += x11/library/toolkit/libxaw7 +REQUIRED_PACKAGES += x11/library/toolkit/libxt diff -r 60344306d223 -r 30b42c38bbc4 components/nethack/resolve.deps --- a/components/nethack/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -shell/ksh93 -system/library -x11/compatibility/links-xorg -x11/library/libx11 -x11/library/libxpm -x11/library/toolkit/libxaw7 -x11/library/toolkit/libxt diff -r 60344306d223 -r 30b42c38bbc4 components/nmap/Makefile --- a/components/nmap/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/nmap/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,9 +20,13 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # +# Can't use the Studio compilers as they don't support the GNU +# __attribute__ extension +COMPILER = gcc + include ../../make-rules/shared-macros.mk COMPONENT_NAME= nmap @@ -37,13 +41,9 @@ TPNO= 9217 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk - -# Can't use the Studio compilers as they don't support the GNU -# __attribute__ extension -COMPILER = gcc +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = \ ($(CLONEY) $(SOURCE_DIR) $(@D)) @@ -83,6 +83,15 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/pcre +REQUIRED_PACKAGES += library/python-2/pygobject-26 +REQUIRED_PACKAGES += library/python-2/pygtk2-26 +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += runtime/lua +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime +REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime +REQUIRED_PACKAGES += system/library/libpcap +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/nmap/resolve.deps --- a/components/nmap/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -library/pcre -library/python-2/pygobject-26 -library/python-2/pygtk2-26 -library/python/pygobject-26 -library/python/pygtk2-26 -library/security/openssl -runtime/lua -runtime/python-26 -system/library -system/library/gcc/gcc-c-runtime -system/library/gcc/gcc-c++-runtime -system/library/libpcap -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/novnc/Makefile --- a/components/novnc/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/novnc/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,8 +34,8 @@ TPNO= 18799 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -48,7 +48,3 @@ clean:: $(RM) -r $(BUILD_DIR) - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/novnc/resolve.deps --- a/components/novnc/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -consolidation/userland/userland-incorporation diff -r 60344306d223 -r 30b42c38bbc4 components/ntp/Makefile --- a/components/ntp/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/ntp/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -44,9 +44,9 @@ ASLR_MODE= $(ASLR_ENABLE) -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CFLAGS += $(studio_C99_ENABLE) -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ @@ -64,12 +64,20 @@ CONFIGURE_OPTIONS += --without-ntpsnmpd CONFIGURE_OPTIONS += --with-openssl-libdir=/lib -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - configure: $(CONFIGURE_32) build: $(BUILD_32) install: $(INSTALL_32) test: $(NO_TESTS) -include ../../make-rules/depend.mk + +REQUIRED_PACKAGES += library/libedit +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/perl-516 +REQUIRED_PACKAGES += service/network/dns/mdns +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/library/security/crypto diff -r 60344306d223 -r 30b42c38bbc4 components/ntp/resolve.deps --- a/components/ntp/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -library/libedit -library/security/openssl -runtime/perl-512 -runtime/perl-516 -service/network/dns/mdns -shell/ksh93 -system/core-os -system/library -system/library/math -system/library/security/crypto diff -r 60344306d223 -r 30b42c38bbc4 components/ocaml/Makefile --- a/components/ocaml/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/ocaml/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -57,9 +57,9 @@ TPNO= 9233 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_ENV += CFLAGS="$(CFLAGS)" @@ -162,6 +162,10 @@ test: $(TEST_32) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += runtime/tcl-8 +REQUIRED_PACKAGES += runtime/tk-8 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += x11/library/libx11 diff -r 60344306d223 -r 30b42c38bbc4 components/ocaml/resolve.deps --- a/components/ocaml/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -runtime/tcl-8 -runtime/tk-8 -shell/ksh93 -system/library -system/library/math -x11/library/libx11 diff -r 60344306d223 -r 30b42c38bbc4 components/open-fabrics/Makefile --- a/components/open-fabrics/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/open-fabrics/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. # LD_Z_IGNORE = @@ -44,7 +44,7 @@ TPNO_RDS_TOOLS= 5092 include ../../make-rules/shared-macros.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/ips.mk include ofed.mk # for now, everything with a Makefile should be built @@ -69,7 +69,8 @@ .DEFAULT: publish -download prep install test: $(SUBDIRS) +download:: +prep install test: $(SUBDIRS) parfait: $(MAKE) PARFAIT_BUILD=yes install @@ -95,3 +96,14 @@ infiniband-diags: libibverbs opensm FORCE: + +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/perl-516 +REQUIRED_PACKAGES += runtime/tcl-8 +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime +REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/open-fabrics/ibutils/Makefile --- a/components/open-fabrics/ibutils/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/open-fabrics/ibutils/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,8 +18,12 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # + +# OFED only builds with GCC +COMPILER=gcc3 + include ../../../make-rules/shared-macros.mk COMPONENT_NAME= ibutils @@ -30,8 +34,8 @@ sha256:8db2fcb20102c37e7037826c58b899092df034aac870d3d50a13263746f17f18 COMPONENT_ARCHIVE_URL= http://www.openfabrics.org/downloads/ibutils/$(COMPONENT_ARCHIVE) -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk include ../ofed.mk LIBS += -lsocket -lnsl -lopensm -losmvendor -losmcomp -libumad -libmad @@ -100,8 +104,5 @@ install: $(INSTALL_32) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - test: $(NO_TESTS) -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/open-fabrics/infiniband-diags/Makefile --- a/components/open-fabrics/infiniband-diags/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/open-fabrics/infiniband-diags/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,8 +18,12 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # + +# OFED only builds with GCC +COMPILER=gcc3 + include ../../../make-rules/shared-macros.mk COMPONENT_NAME= infiniband-diags @@ -30,14 +34,12 @@ sha256:0baf6694d54602a66dfc2b82a765c933b24534fd8e2bda7e9b89abf503b29c02 COMPONENT_ARCHIVE_URL= http://www.openfabrics.org/downloads/management/$(COMPONENT_ARCHIVE) -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk include ../ofed.mk MAN1MFILES = set_nodedesc.sh.1m -include $(WS_TOP)/make-rules/shared-targets.mk - CFLAGS += -I$(PROTO_DIR)/usr/include/infiniband LIBS += -lsocket -lnsl -lopensm -losmvendor -losmcomp -libumad -libmad -libverbs -ldevinfo @@ -83,10 +85,6 @@ build: $(BUILD_32) -install: $(INSTALL_32) $(PROTOMAN1MFILES) - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) +install: $(INSTALL_32) #$(PROTOMAN1MFILES) test: $(NO_TESTS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/open-fabrics/libibmad/Makefile --- a/components/open-fabrics/libibmad/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/open-fabrics/libibmad/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,8 +18,12 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # + +# OFED only builds with GCC +COMPILER=gcc3 + include ../../../make-rules/shared-macros.mk COMPONENT_NAME= libibmad @@ -30,8 +34,8 @@ sha256:825a1ff5c2df0a6a158e0058560772998d39ae633a838c19b58a99650dc199b0 COMPONENT_ARCHIVE_URL= http://www.openfabrics.org/downloads/management/$(COMPONENT_ARCHIVE) -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk include ../ofed.mk LIBS += -lsocket -lnsl -libumad @@ -47,8 +51,5 @@ install: $(INSTALL_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - test: $(NO_TESTS) -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/open-fabrics/libibumad/Makefile --- a/components/open-fabrics/libibumad/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/open-fabrics/libibumad/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,8 +18,12 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # + +# OFED only builds with GCC +COMPILER=gcc3 + include ../../../make-rules/shared-macros.mk COMPONENT_NAME= libibumad @@ -30,8 +34,8 @@ sha256:4999cb9ff5c7243027d8a154d6b27d1efffaa4359b84447731c5ef545fb72229 COMPONENT_ARCHIVE_URL= http://www.openfabrics.org/downloads/management/$(COMPONENT_ARCHIVE) -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk include ../ofed.mk LIBS += -lsocket -lnsl -libverbs @@ -83,8 +87,5 @@ install: $(INSTALL_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - test: $(NO_TESTS) -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/open-fabrics/libibverbs/Makefile --- a/components/open-fabrics/libibverbs/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/open-fabrics/libibverbs/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,8 +18,12 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # + +# OFED only builds with GCC +COMPILER=gcc3 + include ../../../make-rules/shared-macros.mk COMPONENT_NAME= libibverbs @@ -30,8 +34,8 @@ sha256:1e04aa9d518e3dc372fdda6bd25bf072caae4c85c38d0ae095a614104aa583d4 COMPONENT_ARCHIVE_URL= http://www.openfabrics.org/downloads/libibverbs/$(COMPONENT_ARCHIVE) -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk include ../ofed.mk MAN3FILES = ibv_alloc_shpd.3 \ @@ -40,7 +44,7 @@ ibv_gid_reachable.3 \ ibv_register_sm_events.3 -include $(WS_TOP)/make-rules/shared-targets.mk +include $(WS_MAKE_RULES)/shared-targets.mk # add flags to get at extra bits from other components' source trees CPPFLAGS += -I$(PWD)/../libmlx4/libmlx4-1.0.1/src @@ -83,8 +87,4 @@ install: $(INSTALL_32_and_64) $(PROTOMAN3FILES) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - test: $(NO_TESTS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/open-fabrics/libmlx4/Makefile --- a/components/open-fabrics/libmlx4/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/open-fabrics/libmlx4/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,8 +18,12 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # + +# OFED only builds with GCC +COMPILER=gcc3 + include ../../../make-rules/shared-macros.mk COMPONENT_NAME= libmlx4 @@ -30,8 +34,8 @@ sha256:ac3aa335d5749a8edc471630b1f5049122c8b7b66bab88c299e255122028e19c COMPONENT_ARCHIVE_URL= http://www.openfabrics.org/downloads/libmlx4/$(COMPONENT_ARCHIVE) -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk include ../ofed.mk # --disable-libcheck is not a supported option for this component @@ -66,8 +70,5 @@ install: $(INSTALL_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - test: $(NO_TESTS) -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/open-fabrics/librdmacm/Makefile --- a/components/open-fabrics/librdmacm/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/open-fabrics/librdmacm/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,8 +18,12 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # + +# OFED only builds with GCC +COMPILER=gcc3 + include ../../../make-rules/shared-macros.mk COMPONENT_NAME= librdmacm @@ -30,8 +34,8 @@ sha256:b74d367415b4f294f3821955428f3e362b91f779042c88970f99941216c13a7c COMPONENT_ARCHIVE_URL= http://www.openfabrics.org/downloads/rdmacm/$(COMPONENT_ARCHIVE) -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk include ../ofed.mk LIBS += -libverbs -lsocket -lnsl @@ -67,8 +71,5 @@ install: $(INSTALL_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - test: $(NO_TESTS) -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/open-fabrics/libsdp/Makefile --- a/components/open-fabrics/libsdp/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/open-fabrics/libsdp/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,8 +18,12 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # + +# OFED only builds with GCC +COMPILER=gcc3 + include ../../../make-rules/shared-macros.mk COMPONENT_NAME= libsdp @@ -30,15 +34,13 @@ sha256:b72d4d84c7a02207c261082d1837757f8c131942193ceaf017daf684d61e8be1 COMPONENT_ARCHIVE_URL= http://www.openfabrics.org/downloads/libsdp/$(COMPONENT_ARCHIVE) -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk include ../ofed.mk MAN3FILES = libsdp.3lib MAN4FILES = libsdp.conf.4 -include $(WS_TOP)/make-rules/shared-targets.mk - SUFFIX.64 = $(MACH64) CFLAGS += -D_POSIX_PTHREAD_SEMANTICS @@ -68,8 +70,4 @@ install: $(INSTALL_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - test: $(NO_TESTS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/open-fabrics/ofed.mk --- a/components/open-fabrics/ofed.mk Mon Feb 16 13:54:04 2015 -0800 +++ b/components/open-fabrics/ofed.mk Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # # Since we are building these as a set and not packaging them individually at @@ -26,9 +26,6 @@ # so we override PROTO_DIR PROTO_DIR = $(WS_COMPONENTS)/open-fabrics/prototype/$(MACH) -# OFED only builds with GCC -COMPILER=gcc3 - PATH=$(GCC3_ROOT)/bin:/usr/bin:/usr/gnu/bin ifeq ($(strip $(PARFAIT_BUILD)),yes) PATH=$(PARFAIT_TOOLS_GCC3):$(GCC3_ROOT)/bin:/usr/bin diff -r 60344306d223 -r 30b42c38bbc4 components/open-fabrics/opensm/Makefile --- a/components/open-fabrics/opensm/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/open-fabrics/opensm/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,8 +18,12 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # + +# OFED only builds with GCC +COMPILER=gcc3 + include ../../../make-rules/shared-macros.mk COMPONENT_NAME= opensm @@ -30,8 +34,8 @@ sha256:b8f333815e9d145cbb29310a38d2f2e39f9727b30eb6b15cb0d81fb9db39a2e1 COMPONENT_ARCHIVE_URL= http://www.openfabrics.org/downloads/management/$(COMPONENT_ARCHIVE) -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk include ../ofed.mk CFLAGS += -std=gnu99 @@ -77,8 +81,5 @@ install: $(INSTALL_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - test: $(NO_TESTS) -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/open-fabrics/perftest/Makefile --- a/components/open-fabrics/perftest/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/open-fabrics/perftest/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,8 +18,12 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # + +# OFED only builds with GCC +COMPILER=gcc3 + include ../../../make-rules/shared-macros.mk COMPONENT_NAME= perftest @@ -35,8 +39,8 @@ $(INSTALL_32): BITS=32 $(INSTALL_64): BITS=64 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk include ../ofed.mk MAN1FILES = ib_clock_test.1 \ @@ -45,7 +49,7 @@ ib_send_bw.1 \ rdma_bw.1 -include $(WS_TOP)/make-rules/shared-targets.mk +include $(WS_MAKE_RULES)/shared-targets.mk LIBS += -lsocket -lnsl -lkstat -lrdmacm -libverbs -libumad -libmad @@ -78,8 +82,4 @@ install: $(INSTALL_32_and_64) $(PROTOMAN1FILES) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - test: $(NO_TESTS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/open-fabrics/qperf/Makefile --- a/components/open-fabrics/qperf/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/open-fabrics/qperf/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,8 +18,12 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # + +# OFED only builds with GCC +COMPILER=gcc3 + include ../../../make-rules/shared-macros.mk COMPONENT_NAME= qperf @@ -30,8 +34,8 @@ sha256:304b89d1b006c959cad3b132346a6d061526fe626953ef99c764df396e43f959 COMPONENT_ARCHIVE_URL= http://www.openfabrics.org/downloads/qperf/$(COMPONENT_ARCHIVE) -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk include ../ofed.mk LIBS += -lsocket -lnsl -lkstat -lrdmacm -libverbs @@ -49,8 +53,5 @@ install: $(INSTALL_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - test: $(NO_TESTS) -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/open-fabrics/rds-tools/Makefile --- a/components/open-fabrics/rds-tools/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/open-fabrics/rds-tools/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,8 +18,12 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # + +# OFED only builds with GCC +COMPILER=gcc3 + include ../../../make-rules/shared-macros.mk COMPONENT_NAME= rds-tools @@ -30,8 +34,8 @@ sha256:31b5924f73bed59e513470586c69ebe92eeb708fcc61a0519045fcf7954233a3 COMPONENT_ARCHIVE_URL= http://www.openfabrics.org/downloads/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE) -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk include ../ofed.mk CPPFLAGS += -I$(PROTO_DIR)/usr/include @@ -64,8 +68,5 @@ install: $(INSTALL_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - test: $(NO_TESTS) -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/open-fabrics/resolve.deps --- a/components/open-fabrics/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -runtime/perl-512 -runtime/perl-516 -runtime/tcl-8 -shell/bash -shell/ksh93 -system/library -system/library/gcc/gcc-c-runtime -system/library/gcc/gcc-c++-runtime -system/library/math -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/openexr/Makefile --- a/components/openexr/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/openexr/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -34,9 +34,9 @@ TPNO= 10771 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PATCH_LEVEL = 0 @@ -86,6 +86,8 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/ilmbase +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/openexr/resolve.deps --- a/components/openexr/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -library/ilmbase -library/zlib -system/library -system/library/c++-runtime -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/openldap/Makefile --- a/components/openldap/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/openldap/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # @@ -48,9 +48,9 @@ COMPONENT_ARCHIVE_URL_1= ftp://ftp.eenet.ee/pub/cpan/authors/id/I/IA/IANC/$(COMPONENT_ARCHIVE_1) -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = \ ($(CLONEY) $(SOURCE_DIR) $(@D)) @@ -111,6 +111,11 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += database/berkeleydb-5 +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/security/libsasl +REQUIRED_PACKAGES += system/network diff -r 60344306d223 -r 30b42c38bbc4 components/openldap/resolve.deps --- a/components/openldap/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -database/berkeleydb-5 -library/security/openssl -shell/ksh93 -system/core-os -system/library -system/library/security/libsasl -system/network diff -r 60344306d223 -r 30b42c38bbc4 components/openscap/Makefile --- a/components/openscap/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/openscap/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -22,6 +22,8 @@ # Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # +COMPILER = gcc + include ../../make-rules/shared-macros.mk COMPONENT_NAME= openscap @@ -36,16 +38,15 @@ TPNO = 20626 -COMPILER = gcc CFLAGS+= -std=c99 CFLAGS+= -DNDEBUG CFLAGS+= -DOSCAP_THREAD_SAFE PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PERL_VERSION.32 = 5.12 PERL_VERSION.64 = 5.16 @@ -110,6 +111,24 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += compress/bzip2 +REQUIRED_PACKAGES += developer/swig +REQUIRED_PACKAGES += gnome/config/gconf +REQUIRED_PACKAGES += library/glib2 +REQUIRED_PACKAGES += library/libxml2 +REQUIRED_PACKAGES += library/libxslt +REQUIRED_PACKAGES += library/openldap +REQUIRED_PACKAGES += library/pcre +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/perl-516 +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += runtime/python-27 +REQUIRED_PACKAGES += security/compliance/openscap +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/gcc-3-runtime +REQUIRED_PACKAGES += system/library/gcc-45-runtime +REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/library/security/libgcrypt +REQUIRED_PACKAGES += system/zones +REQUIRED_PACKAGES += web/curl diff -r 60344306d223 -r 30b42c38bbc4 components/openscap/resolve.deps --- a/components/openscap/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -compress/bzip2 -gnome/config/gconf -library/glib2 -library/libxml2 -library/libxslt -library/openldap -library/pcre -runtime/perl-512 -runtime/perl-516 -runtime/python-26 -runtime/python-27 -security/compliance/openscap -system/library -system/library/gcc-3-runtime -system/library/gcc-45-runtime -system/library/gcc/gcc-c-runtime -system/library/math -system/library/security/libgcrypt -system/zones -web/curl diff -r 60344306d223 -r 30b42c38bbc4 components/openssh/Makefile --- a/components/openssh/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/openssh/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -41,9 +41,9 @@ TPNO_OPENSSH= 16633 TPNO_GSSKEX= 20377 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Enable ASLR for this component ASLR_MODE = $(ASLR_ENABLE) @@ -107,6 +107,11 @@ # the STC gate. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/libedit +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += service/security/kerberos-5 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/security/gss +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/openssh/resolve.deps --- a/components/openssh/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -library/libedit -library/security/openssl -library/zlib -service/security/kerberos-5 -system/library -system/library/security/gss -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/openssl/openssl-1.0.1-fips-140/Makefile --- a/components/openssl/openssl-1.0.1-fips-140/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/openssl/openssl-1.0.1-fips-140/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -53,10 +53,10 @@ # only on SPARC. PATCH_PATTERN = [0-9][0-9]*.patch -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk # OpenSSL does not use autoconf but its own configure system. CONFIGURE_SCRIPT = $(SOURCE_DIR)/Configure @@ -196,6 +196,6 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += developer/build/makedepend +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/openssl/openssl-1.0.1-fips-140/resolve.deps --- a/components/openssl/openssl-1.0.1-fips-140/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/openssl/openssl-1.0.1/Makefile --- a/components/openssl/openssl-1.0.1/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/openssl/openssl-1.0.1/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -42,10 +42,10 @@ TPNO= 21111 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin:/usr/perl5/bin ifeq ($(strip $(PARFAIT_BUILD)),yes) @@ -402,6 +402,6 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += developer/build/makedepend +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/openssl/openssl-1.0.1/resolve.deps --- a/components/openssl/openssl-1.0.1/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/openssl/openssl-fips/Makefile --- a/components/openssl/openssl-fips/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/openssl/openssl-fips/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # # @@ -37,8 +37,8 @@ COMPONENT_ARCHIVE_URL = http://www.openssl.org/source/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= library/openssl -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin:/usr/perl5/bin @@ -128,4 +128,3 @@ test: $(NO_TESTS) -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/openstack/cinder/Makefile --- a/components/openstack/cinder/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/openstack/cinder/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ TPNO= 17714 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -79,6 +79,14 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/eventlet-26 +REQUIRED_PACKAGES += library/python/ipython-26 +REQUIRED_PACKAGES += library/python/oslo.config-26 +REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-26 +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/file-system/zfs +REQUIRED_PACKAGES += system/storage/fc-utilities +REQUIRED_PACKAGES += system/storage/iscsi/iscsi-target +REQUIRED_PACKAGES += system/storage/scsi-target-mode-framework diff -r 60344306d223 -r 30b42c38bbc4 components/openstack/cinder/resolve.deps --- a/components/openstack/cinder/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -library/python/eventlet-26 -library/python/ipython-26 -library/python/oslo.config-26 -library/python/sqlalchemy-migrate-26 -runtime/python-26 -system/core-os -system/file-system/zfs -system/storage/fc-utilities -system/storage/iscsi/iscsi-target -system/storage/scsi-target-mode-framework diff -r 60344306d223 -r 30b42c38bbc4 components/openstack/common/Makefile --- a/components/openstack/common/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/openstack/common/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -29,7 +29,7 @@ COMPONENT_PROJECT_URL= http://www.openstack.org/ IPS_COMPONENT_VERSION= 0.$(COMPONENT_VERSION) -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -55,7 +55,3 @@ $(RM) -r $(SOURCE_DIR)/build test: $(NO_TESTS) - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/openstack/common/resolve.deps --- a/components/openstack/common/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -consolidation/userland/userland-incorporation diff -r 60344306d223 -r 30b42c38bbc4 components/openstack/glance/Makefile --- a/components/openstack/glance/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/openstack/glance/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ TPNO= 17717 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -66,6 +66,10 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/eventlet-26 +REQUIRED_PACKAGES += library/python/m2crypto-26 +REQUIRED_PACKAGES += library/python/oslo.config-26 +REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-26 +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += system/core-os diff -r 60344306d223 -r 30b42c38bbc4 components/openstack/glance/resolve.deps --- a/components/openstack/glance/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/python/eventlet-26 -library/python/m2crypto-26 -library/python/oslo.config-26 -library/python/sqlalchemy-migrate-26 -runtime/python-26 -system/core-os diff -r 60344306d223 -r 30b42c38bbc4 components/openstack/heat/Makefile --- a/components/openstack/heat/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/openstack/heat/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ TPNO= 18176 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -62,6 +62,11 @@ # integrated test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/eventlet-26 +REQUIRED_PACKAGES += library/python/oslo.config-26 +REQUIRED_PACKAGES += library/python/setuptools-26 +REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-26 +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += system/core-os diff -r 60344306d223 -r 30b42c38bbc4 components/openstack/heat/resolve.deps --- a/components/openstack/heat/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -library/python/eventlet-26 -library/python/oslo.config-26 -library/python/setuptools-26 -library/python/sqlalchemy-migrate-26 -runtime/python-26 -shell/bash -system/core-os diff -r 60344306d223 -r 30b42c38bbc4 components/openstack/horizon/Makefile --- a/components/openstack/horizon/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/openstack/horizon/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -40,9 +40,9 @@ TPNO_HORIZON= 17862 TPNO_CSS= 16775 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -69,6 +69,7 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/eventlet-26 +REQUIRED_PACKAGES += library/python/oslo.config-26 +REQUIRED_PACKAGES += runtime/python-26 diff -r 60344306d223 -r 30b42c38bbc4 components/openstack/horizon/resolve.deps --- a/components/openstack/horizon/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -library/python/eventlet-26 -library/python/oslo.config-26 -runtime/python-26 diff -r 60344306d223 -r 30b42c38bbc4 components/openstack/keystone/Makefile --- a/components/openstack/keystone/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/openstack/keystone/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ TPNO= 17866 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -58,6 +58,11 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/eventlet-26 +REQUIRED_PACKAGES += library/python/oslo.config-26 +REQUIRED_PACKAGES += library/python/pbr-26 +REQUIRED_PACKAGES += library/python/sqlalchemy-26 +REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-26 +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += system/core-os diff -r 60344306d223 -r 30b42c38bbc4 components/openstack/keystone/resolve.deps --- a/components/openstack/keystone/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -library/python/eventlet-26 -library/python/oslo.config-26 -library/python/pbr-26 -library/python/sqlalchemy-26 -library/python/sqlalchemy-migrate-26 -runtime/python-26 -system/core-os diff -r 60344306d223 -r 30b42c38bbc4 components/openstack/neutron/Makefile --- a/components/openstack/neutron/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/openstack/neutron/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ TPNO= 17716 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -81,6 +81,13 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/eventlet-26 +REQUIRED_PACKAGES += library/python/netaddr-26 +REQUIRED_PACKAGES += library/python/oslo.config-26 +REQUIRED_PACKAGES += network/ipfilter +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += service/network/dnsmasq +REQUIRED_PACKAGES += service/network/evs +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/network diff -r 60344306d223 -r 30b42c38bbc4 components/openstack/neutron/resolve.deps --- a/components/openstack/neutron/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -library/python/eventlet-26 -library/python/netaddr-26 -library/python/oslo.config-26 -network/ipfilter -runtime/python-26 -service/network/dnsmasq -service/network/evs -system/core-os -system/network diff -r 60344306d223 -r 30b42c38bbc4 components/openstack/nova/Makefile --- a/components/openstack/nova/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/openstack/nova/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ TPNO= 17715 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -67,6 +67,18 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += install/archive +REQUIRED_PACKAGES += library/python/eventlet-26 +REQUIRED_PACKAGES += library/python/oslo.config-26 +REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-26 +REQUIRED_PACKAGES += library/python/webob-26 +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += service/network/evs +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/file-system/zfs +REQUIRED_PACKAGES += system/library/storage/suri +REQUIRED_PACKAGES += system/storage/fc-utilities +REQUIRED_PACKAGES += system/storage/iscsi/iscsi-initiator +REQUIRED_PACKAGES += terminal/xterm +REQUIRED_PACKAGES += x11/server/xvnc diff -r 60344306d223 -r 30b42c38bbc4 components/openstack/nova/resolve.deps --- a/components/openstack/nova/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -install/archive -library/python/eventlet-26 -library/python/oslo.config-26 -library/python/sqlalchemy-migrate-26 -library/python/webob-26 -runtime/python-26 -service/network/evs -system/core-os -system/file-system/zfs -system/library/storage/suri -system/storage/fc-utilities -system/storage/iscsi/iscsi-initiator -terminal/xterm -x11/server/xvnc diff -r 60344306d223 -r 30b42c38bbc4 components/openstack/swift/Makefile --- a/components/openstack/swift/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/openstack/swift/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -38,9 +38,9 @@ TPNO= 17868 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -63,6 +63,10 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/eventlet-26 +REQUIRED_PACKAGES += library/python/simplejson-26 +REQUIRED_PACKAGES += library/python/swiftclient-26 +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += service/memcached +REQUIRED_PACKAGES += system/core-os diff -r 60344306d223 -r 30b42c38bbc4 components/openstack/swift/resolve.deps --- a/components/openstack/swift/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/python/eventlet-26 -library/python/simplejson-26 -library/python/swiftclient-26 -runtime/python-26 -service/memcached -system/core-os diff -r 60344306d223 -r 30b42c38bbc4 components/openusb/Makefile --- a/components/openusb/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/openusb/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,8 +18,11 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # + +COMPILER = gcc + include ../../make-rules/shared-macros.mk COMPONENT_NAME= openusb @@ -35,17 +38,15 @@ TPNO= 8843 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_ENV += CFLAGS="$(CFLAGS)" COMPONENT_PRE_CONFIGURE_ACTION = \ ($(CLONEY) $(SOURCE_DIR) $(@D)) -COMPILER = gcc - PATCH_LEVEL = 1 COMPONENT_POST_BUILD_ACTION = \ @@ -61,6 +62,12 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/glib2 +REQUIRED_PACKAGES += system/hal +REQUIRED_PACKAGES += system/io/usb +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime +REQUIRED_PACKAGES += system/library/libdbus +REQUIRED_PACKAGES += system/library/libdbus-glib +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/openusb/resolve.deps --- a/components/openusb/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -library/glib2 -system/hal -system/library -system/library/gcc-3-runtime -system/library/gcc-45-runtime -system/library/gcc/gcc-c-runtime -system/library/libdbus -system/library/libdbus-glib -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/p7zip/Makefile --- a/components/p7zip/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/p7zip/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -42,9 +42,9 @@ TPNO= 20368 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk # the tests fail horribly with -Bdirect LD_B_DIRECT= @@ -84,6 +84,8 @@ # build does this always test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/p7zip/resolve.deps --- a/components/p7zip/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -shell/ksh93 -system/library -system/library/c++-runtime -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/pam_pkcs11/Makefile --- a/components/pam_pkcs11/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/pam_pkcs11/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 17173 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" CONFIGURE_OPTIONS += --with-pcsclite=no @@ -53,6 +53,7 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/pam_pkcs11/resolve.deps --- a/components/pam_pkcs11/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -library/security/openssl -shell/bash -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/parallel/Makefile --- a/components/parallel/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/parallel/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -40,9 +40,9 @@ TPNO= 8651 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Set PATH to find /usr/perl5/bin/pod2man, so that the man pages can be # automatically generated @@ -59,4 +59,7 @@ test: $(NO_TESTS) -include ../../make-rules/depend.mk + +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/perl-516 +REQUIRED_PACKAGES += shell/which diff -r 60344306d223 -r 30b42c38bbc4 components/parallel/resolve.deps --- a/components/parallel/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/perl-512 -runtime/perl-516 -shell/which diff -r 60344306d223 -r 30b42c38bbc4 components/patch/Makefile --- a/components/patch/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/patch/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -35,9 +35,9 @@ TPNO= 18936 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" @@ -54,6 +54,5 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/patch/resolve.deps --- a/components/patch/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/pbzip2/Makefile --- a/components/pbzip2/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/pbzip2/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 11059 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk # pbzip2 Solaris Sun Studio build uses a non-standard Makefile COMPONENT_BUILD_ARGS += CC="$(CXX)" @@ -56,4 +56,8 @@ test: $(NO_TESTS) -include ../../make-rules/depend.mk + +REQUIRED_PACKAGES += compress/bzip2 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/pbzip2/resolve.deps --- a/components/pbzip2/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -compress/bzip2 -system/library -system/library/c++-runtime -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/pconsole/Makefile --- a/components/pconsole/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/pconsole/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 9270 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Required to configure correctly. COMPONENT_PRE_CONFIGURE_ACTION = \ @@ -69,6 +69,7 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/pconsole/resolve.deps --- a/components/pconsole/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -shell/bash -shell/ksh93 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/pcre/Makefile --- a/components/pcre/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/pcre/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -19,7 +19,7 @@ # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -36,10 +36,10 @@ TPNO= 9271 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk # pick up -xc99=all in CFLAGS studio_C99MODE= $(studio_C99_ENABLE) @@ -123,6 +123,9 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += compress/bzip2 +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime diff -r 60344306d223 -r 30b42c38bbc4 components/pcre/resolve.deps --- a/components/pcre/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -compress/bzip2 -library/zlib -shell/ksh93 -system/library -system/library/c++-runtime diff -r 60344306d223 -r 30b42c38bbc4 components/perl/perl516/Makefile --- a/components/perl/perl516/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/perl/perl516/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -41,9 +41,9 @@ COMPONENT_ARCHIVE_URL= http://www.cpan.org/src/5.0/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= utility/perl -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # # Override these compiler settings because they are causing problems @@ -143,6 +143,9 @@ # # -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += database/berkeleydb-5 +REQUIRED_PACKAGES += library/database/gdbm +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/perl/perl516/resolve.deps --- a/components/perl/perl516/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -database/berkeleydb-5 -library/database/gdbm -system/library -system/library/math -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/perl512/Makefile --- a/components/perl512/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/perl512/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -40,9 +40,9 @@ COMPONENT_BUGDB= utility/perl TPNO= 9223 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # # Override these compiler settings because they are causing problems @@ -150,6 +150,11 @@ # -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += developer/lexer/flex +REQUIRED_PACKAGES += developer/parser/bison +REQUIRED_PACKAGES += database/berkeleydb-5 +REQUIRED_PACKAGES += library/database/gdbm +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/perl512/resolve.deps --- a/components/perl512/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -database/berkeleydb-5 -library/database/gdbm -system/library -system/library/math -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/DBI/Makefile --- a/components/perl_modules/DBI/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/perl_modules/DBI/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 17614 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/makemaker.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/makemaker.mk COMPONENT_TEST_TARGETS = test @@ -48,6 +48,5 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/DBI/resolve.deps --- a/components/perl_modules/DBI/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/perl-512 -runtime/perl-516 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/authen-pam/Makefile --- a/components/perl_modules/authen-pam/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/perl_modules/authen-pam/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -39,9 +39,9 @@ # build threaded 5.12 support too PERL_VERSIONS += 5.12-mt -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/makemaker.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/makemaker.mk # Pick up the patch to configure.ac in the 01-solaris.patch file COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv); @@ -69,6 +69,5 @@ realtest: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/authen-pam/resolve.deps --- a/components/perl_modules/authen-pam/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -runtime/perl-512 -runtime/perl-516 -runtime/perl-threaded-512 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/cssh/Makefile --- a/components/perl_modules/cssh/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/perl_modules/cssh/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 13257 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/makemaker.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/makemaker.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -48,6 +48,12 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/perl-5/perl-x11-protocol +REQUIRED_PACKAGES += library/perl-5/perl-x11-protocol-512 +REQUIRED_PACKAGES += library/perl-5/perl-x11-protocol-516 +REQUIRED_PACKAGES += library/perl5/perl-tk +REQUIRED_PACKAGES += library/perl5/perl-tk-512 +REQUIRED_PACKAGES += library/perl5/perl-tk-516 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/cssh/resolve.deps --- a/components/perl_modules/cssh/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -library/perl5/perl-tk -library/perl5/perl-tk-512 -library/perl5/perl-tk-516 -library/perl-5/perl-tk -library/perl-5/perl-tk-512 -library/perl-5/perl-tk-516 -library/perl-5/perl-x11-protocol -library/perl-5/perl-x11-protocol-512 -library/perl-5/perl-x11-protocol-516 -runtime/perl-512 -runtime/perl-516 -shell/ksh93 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/net-ssleay/Makefile --- a/components/perl_modules/net-ssleay/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/perl_modules/net-ssleay/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -36,9 +36,9 @@ COMPONENT_BUGDB= perl-mod/net-ssleay -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/makemaker.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/makemaker.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -55,6 +55,6 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/net-ssleay/resolve.deps --- a/components/perl_modules/net-ssleay/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -library/security/openssl -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/perl-tk/Makefile --- a/components/perl_modules/perl-tk/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/perl_modules/perl-tk/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 13259 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/makemaker.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/makemaker.mk # override LIBS so that the Tk.so RunPATH doesn't get set. CONFIGURE_OPTIONS += LIBS="-lXft -lX11 -lfontconfig -lm -lc" @@ -54,6 +54,10 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += runtime/tk-8 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/fontconfig +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += x11/library/libx11 +REQUIRED_PACKAGES += x11/library/libxft diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/perl-tk/resolve.deps --- a/components/perl_modules/perl-tk/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -library/libjpeg -library/libpng -library/libx11 -library/libxft -runtime/perl-512 -runtime/perl-516 -system/library -system/library/fontconfig -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/perl-x11-protocol/Makefile --- a/components/perl_modules/perl-x11-protocol/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/perl_modules/perl-x11-protocol/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -34,9 +34,9 @@ TPNO= 13258 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/makemaker.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/makemaker.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -49,6 +49,4 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/perl-x11-protocol/resolve.deps --- a/components/perl_modules/perl-x11-protocol/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/perl-512 -runtime/perl-516 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/pmtools/Makefile --- a/components/perl_modules/pmtools/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/perl_modules/pmtools/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -35,9 +35,9 @@ COMPONENT_ARCHIVE_URL= http://search.cpan.org/CPAN/authors/id/M/ML/MLFISHER/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= utility/perl-pmtools -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/makemaker.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/makemaker.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -47,6 +47,5 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += system/core-os diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/pmtools/resolve.deps --- a/components/perl_modules/pmtools/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/core-os diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/xml-libxml/Makefile --- a/components/perl_modules/xml-libxml/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/perl_modules/xml-libxml/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -38,9 +38,9 @@ # build threaded 5.12 support too PERL_VERSIONS += 5.12-mt -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/makemaker.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/makemaker.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -55,6 +55,6 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/libxml2 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/xml-libxml/resolve.deps --- a/components/perl_modules/xml-libxml/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -library/libxml2 -runtime/perl-512 -runtime/perl-516 -runtime/perl-threaded-512 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/xml-namespacesupport/Makefile --- a/components/perl_modules/xml-namespacesupport/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/perl_modules/xml-namespacesupport/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -38,9 +38,9 @@ # build threaded 5.12 support too PERL_VERSIONS += 5.12-mt -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/makemaker.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/makemaker.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -55,6 +55,3 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/xml-namespacesupport/resolve.deps --- a/components/perl_modules/xml-namespacesupport/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/perl-512 -runtime/perl-516 -runtime/perl-threaded-512 diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/xml-parser/Makefile --- a/components/perl_modules/xml-parser/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/perl_modules/xml-parser/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -41,13 +41,13 @@ TPNO= 9386 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/makemaker.mk - # build threaded 5.12 support too PERL_VERSIONS += 5.12-mt +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/makemaker.mk + ASLR_MODE = $(ASLR_NOT_APPLICABLE) # man pages go in the common area @@ -66,6 +66,6 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/expat +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/xml-parser/resolve.deps --- a/components/perl_modules/xml-parser/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -library/expat -runtime/perl-threaded-512 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/xml-sax-base/Makefile --- a/components/perl_modules/xml-sax-base/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/perl_modules/xml-sax-base/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -39,9 +39,9 @@ # build threaded 5.12 support too PERL_VERSIONS += 5.12-mt -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/makemaker.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/makemaker.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -59,6 +59,3 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/xml-sax-base/resolve.deps --- a/components/perl_modules/xml-sax-base/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/perl-512 -runtime/perl-516 -runtime/perl-threaded-512 diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/xml-sax/Makefile --- a/components/perl_modules/xml-sax/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/perl_modules/xml-sax/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -38,9 +38,9 @@ # build threaded 5.12 support too PERL_VERSIONS += 5.12-mt -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/makemaker.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/makemaker.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -55,6 +55,3 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/xml-sax/resolve.deps --- a/components/perl_modules/xml-sax/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/perl-512 -runtime/perl-516 -runtime/perl-threaded-512 diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/xml-simple/Makefile --- a/components/perl_modules/xml-simple/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/perl_modules/xml-simple/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ # build threaded 5.12 support too PERL_VERSIONS += 5.12-mt -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/makemaker.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/makemaker.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -59,6 +59,3 @@ # test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/perl_modules/xml-simple/resolve.deps --- a/components/perl_modules/xml-simple/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/perl-512 -runtime/perl-516 -runtime/perl-threaded-512 diff -r 60344306d223 -r 30b42c38bbc4 components/php-5_2/Makefile --- a/components/php-5_2/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/php-5_2/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -30,7 +30,7 @@ TPNO_PHP_TCPWRAP= 17132 TPNO_PHP_XDEBUG= 17133 -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/ips.mk ## ## This Makefile for local usage only. @@ -166,7 +166,8 @@ .DEFAULT: publish -download prep install test publish: $(SUBDIRS) +download:: $(SUBDIRS) +prep install test publish: $(SUBDIRS) clean: $(SUBDIRS) $(RM) -r $(BUILD_DIR) @@ -194,3 +195,28 @@ xdebug-zts: php-sapi php-nsapi FORCE: + +REQUIRED_PACKAGES += compress/bzip2 +REQUIRED_PACKAGES += developer/lexer/flex +REQUIRED_PACKAGES += developer/parser/bison +REQUIRED_PACKAGES += database/mysql-55/library +REQUIRED_PACKAGES += image/library/libjpeg +REQUIRED_PACKAGES += image/library/libpng +REQUIRED_PACKAGES += library/libidn +REQUIRED_PACKAGES += library/libtool/libltdl +REQUIRED_PACKAGES += library/libxml2 +REQUIRED_PACKAGES += library/libxslt +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/freetype-2 +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/library/security/libmcrypt +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += system/management/snmp/net-snmp +REQUIRED_PACKAGES += text/tidy +REQUIRED_PACKAGES += web/curl +REQUIRED_PACKAGES += x11/library/libx11 +REQUIRED_PACKAGES += x11/library/libxpm diff -r 60344306d223 -r 30b42c38bbc4 components/php-5_2/extensions-zts.mk --- a/components/php-5_2/extensions-zts.mk Mon Feb 16 13:54:04 2015 -0800 +++ b/components/php-5_2/extensions-zts.mk Sun Feb 15 19:02:09 2015 -0600 @@ -18,12 +18,12 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk include ../common.mk @@ -81,7 +81,3 @@ $(BUILD_DIR_32)/.configured: ../php-sapi/build/$(MACH32)/.installed $(BUILD_DIR_32)/.configured: ../php-nsapi/build/$(MACH32)/.installed - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/php-5_2/extensions.mk --- a/components/php-5_2/extensions.mk Mon Feb 16 13:54:04 2015 -0800 +++ b/components/php-5_2/extensions.mk Sun Feb 15 19:02:09 2015 -0600 @@ -18,12 +18,12 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk include ../common.mk @@ -76,8 +76,3 @@ $(MAKE) install ) $(INSTALL_32): ../$(COMPONENT_NAME)-zts/build/$(MACH32)/.installed - - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/php-5_2/imap/Makefile --- a/components/php-5_2/imap/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/php-5_2/imap/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ # but our downloader cannot. Proxy issue? COMPONENT_ARCHIVE_URL= $(EXTERNAL_ARCHIVE_MIRROR)/$(COMPONENT_ARCHIVE) -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/justmake.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk CFLAGS += $(CPP_LARGEFILES) # enable legacy stdio prototypes @@ -61,6 +61,3 @@ publish: build -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/php-5_2/php-cgi/Makefile --- a/components/php-5_2/php-cgi/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/php-5_2/php-cgi/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -33,9 +33,9 @@ PATCH_DIR = ../php-sapi/patches -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk include ../common.mk include ../php-sapi/php.mk @@ -72,6 +72,3 @@ ## ##$(BUILD_DIR_32)/.configured: ../php-sapi/build/$(MACH32)/.installed -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/php-5_2/php-nsapi/Makefile --- a/components/php-5_2/php-nsapi/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/php-5_2/php-nsapi/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -46,9 +46,9 @@ PATCH_DIR = ../php-sapi/patches -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk include ../common.mk include ../php-sapi/php.mk @@ -148,6 +148,3 @@ ## ##$(BUILD_DIR_32)/.configured: ../php-sapi/build/$(MACH32)/.installed -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/php-5_2/php-sapi/Makefile --- a/components/php-5_2/php-sapi/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/php-5_2/php-sapi/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -44,9 +44,9 @@ # internal servers. COMPONENT_ARCHIVE_URL_1= $(EXTERNAL_ARCHIVE_MIRROR)/$(COMPONENT_ARCHIVE_1) -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk include ../common.mk include ./php.mk @@ -237,7 +237,3 @@ $(BUILD_DIR_32)/.configured: ../imap/build/$(MACH32)/.built PHP-NSAPI_INSTALL: ../php-nsapi/build/$(MACH32)/.installed PHP-CGI_INSTALL: ../php-cgi/build/$(MACH32)/.installed - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/php-5_2/resolve.deps --- a/components/php-5_2/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -compress/bzip2 -database/mysql-55/library -image/library/libjpeg -image/library/libpng -library/libidn -library/libtool/libltdl -library/libxml2 -library/libxslt -library/security/openssl -library/zlib -shell/bash -shell/ksh93 -system/library -system/library/freetype-2 -system/library/math -system/library/security/libmcrypt -system/linker -system/management/snmp/net-snmp -text/tidy -web/curl -x11/library/libx11 -x11/library/libxpm diff -r 60344306d223 -r 30b42c38bbc4 components/php-5_3/Makefile --- a/components/php-5_3/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/php-5_3/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -31,7 +31,7 @@ TPNO_PHP_XDEBUG= 17133 TPNO_PHP_ZENDOPCACHE= 14926 -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/ips.mk ## ## This Makefile for local usage only. @@ -164,7 +164,8 @@ .DEFAULT: publish -download prep install test publish: $(SUBDIRS) +download:: $(SUBDIRS) +prep install test publish: $(SUBDIRS) clean: $(SUBDIRS) $(RM) -r $(BUILD_DIR) @@ -194,3 +195,27 @@ zendopcache-zts: php-sapi php-nsapi FORCE: + +REQUIRED_PACKAGES += compress/bzip2 +REQUIRED_PACKAGES += developer/lexer/flex +REQUIRED_PACKAGES += developer/parser/bison +REQUIRED_PACKAGES += image/library/libjpeg +REQUIRED_PACKAGES += image/library/libpng +REQUIRED_PACKAGES += library/libidn +REQUIRED_PACKAGES += library/libtool/libltdl +REQUIRED_PACKAGES += library/libxml2 +REQUIRED_PACKAGES += library/libxslt +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/freetype-2 +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/library/security/libmcrypt +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += system/management/snmp/net-snmp +REQUIRED_PACKAGES += text/tidy +REQUIRED_PACKAGES += web/curl +REQUIRED_PACKAGES += x11/library/libx11 +REQUIRED_PACKAGES += x11/library/libxpm diff -r 60344306d223 -r 30b42c38bbc4 components/php-5_3/extensions-zts.mk --- a/components/php-5_3/extensions-zts.mk Mon Feb 16 13:54:04 2015 -0800 +++ b/components/php-5_3/extensions-zts.mk Sun Feb 15 19:02:09 2015 -0600 @@ -18,12 +18,12 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk include ../common.mk @@ -81,7 +81,3 @@ $(BUILD_DIR_32)/.configured: ../php-sapi/build/$(MACH32)/.installed $(BUILD_DIR_32)/.configured: ../php-nsapi/build/$(MACH32)/.installed - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/php-5_3/extensions.mk --- a/components/php-5_3/extensions.mk Mon Feb 16 13:54:04 2015 -0800 +++ b/components/php-5_3/extensions.mk Sun Feb 15 19:02:09 2015 -0600 @@ -18,12 +18,12 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk include ../common.mk @@ -75,8 +75,3 @@ $(MAKE) install ) $(INSTALL_32): ../$(COMPONENT_NAME)-zts/build/$(MACH32)/.installed - - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/php-5_3/imap/Makefile --- a/components/php-5_3/imap/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/php-5_3/imap/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -31,9 +31,9 @@ COMPONENT_ARCHIVE_URL= ftp://ftp.cac.washington.edu/imap/$(COMPONENT_ARCHIVE) COMPONENT_PROJECT_URL= http://www.washington.edu/imap/ -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/justmake.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk CFLAGS += $(CPP_LARGEFILES) # enable legacy stdio prototypes @@ -59,6 +59,3 @@ publish: build -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/php-5_3/php-cgi/Makefile --- a/components/php-5_3/php-cgi/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/php-5_3/php-cgi/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ include ../php-sapi/php.mk -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk include ../common.mk @@ -65,7 +65,3 @@ # php-sapi does the publish publish: install - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/php-5_3/php-nsapi/Makefile --- a/components/php-5_3/php-nsapi/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/php-5_3/php-nsapi/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -50,9 +50,9 @@ include ../php-sapi/php.mk -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk include ../common.mk @@ -144,7 +144,3 @@ # php-sapi does the publish publish: install - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/php-5_3/php-sapi/Makefile --- a/components/php-5_3/php-sapi/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/php-5_3/php-sapi/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -60,9 +60,9 @@ include ./php.mk -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk include ../common.mk @@ -260,7 +260,3 @@ $(BUILD_DIR_32)/.configured: ../imap/build/$(MACH32)/.built PHP-NSAPI_INSTALL: ../php-nsapi/build/$(MACH32)/.installed PHP-CGI_INSTALL: ../php-cgi/build/$(MACH32)/.installed - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/php-5_3/resolve.deps --- a/components/php-5_3/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -compress/bzip2 -database/mysql-51/library -image/library/libjpeg -image/library/libpng -library/libidn -library/libtool/libltdl -library/libxml2 -library/libxslt -library/security/openssl -library/zlib -shell/bash -shell/ksh93 -system/library -system/library/freetype-2 -system/library/math -system/library/security/libmcrypt -system/linker -system/management/snmp/net-snmp -text/tidy -web/curl -x11/library/libx11 -x11/library/libxpm diff -r 60344306d223 -r 30b42c38bbc4 components/php-common/Makefile --- a/components/php-common/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/php-common/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -27,8 +27,8 @@ COMPONENT_VERSION= 11.1 COMPONENT_PROJECT_URL= http://www.php.net/ COMPONENT_BUGDB= utility/php -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Do not apply the standard license transforms for this component. The # license actions are already tagged with the attributes in the .p5m file. @@ -37,8 +37,9 @@ ASLR_MODE = $(ASLR_NOT_APPLICABLE) # nothing to download or build; just package -download prep configure build install test: - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) +download:: +prep configure build install test: clobber: clean + +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/php-common/resolve.deps --- a/components/php-common/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/pigz/Makefile --- a/components/pigz/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/pigz/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -35,9 +35,9 @@ TPNO= 11152 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk PKG_PROTO_DIRS += $(BUILD_DIR_64) @@ -56,6 +56,6 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/pigz/resolve.deps --- a/components/pigz/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -library/zlib -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/pinentry/Makefile --- a/components/pinentry/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/pinentry/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 8850 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PATCH_LEVEL = 0 @@ -97,6 +97,9 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/desktop/gtk2 +REQUIRED_PACKAGES += library/desktop/pango +REQUIRED_PACKAGES += library/glib2 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += x11/library/libx11 diff -r 60344306d223 -r 30b42c38bbc4 components/pinentry/resolve.deps --- a/components/pinentry/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -library/desktop/gtk2 -library/desktop/pango -library/glib2 -system/library -x11/library/libx11 diff -r 60344306d223 -r 30b42c38bbc4 components/pixz/Makefile --- a/components/pixz/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/pixz/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 11623 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk PKG_PROTO_DIRS += $(BUILD_DIR_64) PKG_PROTO_DIRS += $(COMPONENT_DIR)/files @@ -62,6 +62,7 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += compress/xz +REQUIRED_PACKAGES += library/libarchive +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/pixz/resolve.deps --- a/components/pixz/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -compress/xz -library/libarchive -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/pkg-config/Makefile --- a/components/pkg-config/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/pkg-config/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -37,9 +37,9 @@ TPNO= 9421 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # otherwise our default PKG_CONFIG_PATH will change to the 64-bit libdir CONFIGURE_LIBDIR.64 = $(CONFIGURE_PREFIX)/lib @@ -62,6 +62,5 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/pkg-config/resolve.deps --- a/components/pkg-config/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/popt/Makefile --- a/components/popt/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/popt/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -37,10 +37,10 @@ TPNO= 7904 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk COMPONENT_PREP_ACTION = \ (cd $(@D) ; \ @@ -79,6 +79,4 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/popt/resolve.deps --- a/components/popt/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/privoxy/Makefile --- a/components/privoxy/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/privoxy/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 9002 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = \ ($(CLONEY) $(SOURCE_DIR) $(@D)) @@ -68,6 +68,10 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/pcre +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/network diff -r 60344306d223 -r 30b42c38bbc4 components/privoxy/resolve.deps --- a/components/privoxy/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/pcre -library/zlib -shell/ksh93 -system/core-os -system/library -system/network diff -r 60344306d223 -r 30b42c38bbc4 components/procmail/Makefile --- a/components/procmail/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/procmail/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ TPNO= 9003 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_BUILD_ENV += CC="$(CC) -m64" @@ -59,6 +59,7 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/procmail/resolve.deps --- a/components/procmail/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -shell/ksh93 -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/proftpd/Makefile --- a/components/proftpd/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/proftpd/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -49,9 +49,9 @@ TPNO_PROFTPD= 17783 TPNO_MOD_GSS= 13480 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # IPS_COMPONENT_VERSION is by default set to $(COMPONENT_VERSION) but it is not # enough for us. We need to include the $(COMPONENT_SUBVERSION) somehow. @@ -109,6 +109,12 @@ test: $(NO_TESTS) # libcheck and specific Perl Test::Unit version is required for full test -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += service/security/kerberos-5 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/security/gss +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += system/network diff -r 60344306d223 -r 30b42c38bbc4 components/proftpd/resolve.deps --- a/components/proftpd/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -library/security/openssl -shell/ksh93 -system/core-os -system/library -system/library/security/gss -system/linker -system/network -service/security/kerberos-5 diff -r 60344306d223 -r 30b42c38bbc4 components/psutils/Makefile --- a/components/psutils/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/psutils/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,10 +18,10 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk -include ../../make-rules/shared-targets.mk +include $(WS_MAKE_RULES)/shared-targets.mk COMPONENT_NAME= psutils COMPONENT_VERSION= p17 @@ -39,9 +39,9 @@ TPNO= 9004 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk # Can't use 'p17' since that is not accepted by pkg. And homepage # http://knackered.knackered.org/angus/psutils/ states that development version @@ -79,6 +79,6 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/psutils/resolve.deps --- a/components/psutils/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/perl-512 -shell/ksh93 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/ptp/Makefile --- a/components/ptp/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/ptp/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -21,6 +21,8 @@ # Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # +COMPILER = gcc + include ../../make-rules/shared-macros.mk COMPONENT_NAME= ptpd @@ -38,16 +40,14 @@ TPNO_PTP= 12665 TPNO_SOLARFLARE= 15817 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk PATCH_LEVEL = 1 PKG_PROTO_DIRS += $(BUILD_DIR_64) -COMPILER = gcc - COMPONENT_BUILD_ENV += CC=$(CC) # Enable ASLR for this component @@ -59,8 +59,9 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk - - +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/libv12n +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/ptp/resolve.deps --- a/components/ptp/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -shell/ksh93 -system/core-os -system/library -system/library/libv12n -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/pv/Makefile --- a/components/pv/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/pv/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 19386 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = \ ($(CLONEY) $(SOURCE_DIR) $(@D)) @@ -63,6 +63,5 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/pv/resolve.deps --- a/components/pv/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/pwgen/Makefile --- a/components/pwgen/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/pwgen/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ CONFIGURE_OPTIONS += LDFLAGS="$(CC_BITS)" -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # IPS Package versions contain sequences of non-negative (for now) integers, # separated by dots. Leading zeroes are not allowed, due to ordering @@ -76,6 +76,6 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/security/crypto diff -r 60344306d223 -r 30b42c38bbc4 components/pwgen/resolve.deps --- a/components/pwgen/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -system/library -system/library/security/crypto diff -r 60344306d223 -r 30b42c38bbc4 components/pylint/Makefile --- a/components/pylint/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/pylint/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -19,7 +19,7 @@ # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ # Depends on logilab-common which is not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/setup.py.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/setup.py.mk # There are several pylint documentation files that setup.py isn't installing # but are present in the pylint package on other distributions. Copy them into @@ -130,6 +130,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/pylint/resolve.deps --- a/components/pylint/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/alembic/Makefile --- a/components/python/alembic/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/alembic/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ # Depends on sqlalchemy which is not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -60,6 +60,7 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/setuptools-26 +REQUIRED_PACKAGES += library/python/setuptools-27 +REQUIRED_PACKAGES += library/python/setuptools-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/alembic/resolve.deps --- a/components/python/alembic/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/python/setuptools-26 -library/python/setuptools-27 -library/python/setuptools-34 -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/amqp/Makefile --- a/components/python/amqp/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/amqp/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -49,7 +49,3 @@ # unittest2>=0.4.0, nose, nose-cover3, coverage>=3.0, mock # some of which haven't been integrated yet. test: $(NO_TESTS) - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/amqp/resolve.deps --- a/components/python/amqp/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/anyjson/Makefile --- a/components/python/anyjson/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/anyjson/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -50,6 +50,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/anyjson/resolve.deps --- a/components/python/anyjson/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/argparse/Makefile --- a/components/python/argparse/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/argparse/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -38,9 +38,9 @@ # a 2.6 module. PYTHON_VERSIONS = 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_TEST_DIR = $(COMPONENT_SRC)/test COMPONENT_TEST_ARGS = test_argparse.py @@ -59,6 +59,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/argparse/resolve.deps --- a/components/python/argparse/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -runtime/python-26 diff -r 60344306d223 -r 30b42c38bbc4 components/python/babel/Makefile --- a/components/python/babel/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/babel/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 15897 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -57,6 +57,7 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/setuptools-26 +REQUIRED_PACKAGES += library/python/setuptools-27 +REQUIRED_PACKAGES += library/python/setuptools-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/babel/resolve.deps --- a/components/python/babel/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/python/setuptools-26 -library/python/setuptools-27 -library/python/setuptools-34 -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/beautifulsoup4/Makefile --- a/components/python/beautifulsoup4/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/beautifulsoup4/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -51,6 +51,3 @@ # Tests require the discover, html5lib and unittest2 packages. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/beautifulsoup4/resolve.deps --- a/components/python/beautifulsoup4/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/boto/Makefile --- a/components/python/boto/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/boto/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ # Syntax issues: not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -56,6 +56,7 @@ # which haven't been integrated yet. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/argparse-26 +REQUIRED_PACKAGES += library/python/filechunkio-26 +REQUIRED_PACKAGES += library/python/filechunkio-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/boto/resolve.deps --- a/components/python/boto/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -library/python/argparse-26 -library/python/filechunkio-26 -library/python/filechunkio-27 -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/ceilometerclient/Makefile --- a/components/python/ceilometerclient/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/ceilometerclient/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ # Depends on keystoneclient which is not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -59,6 +59,3 @@ # and testtools, some of which have not been integrated. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/ceilometerclient/resolve.deps --- a/components/python/ceilometerclient/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/cffi/Makefile --- a/components/python/cffi/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/cffi/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 16913 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -83,6 +83,6 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/libffi +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/cffi/resolve.deps --- a/components/python/cffi/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -library/libffi -runtime/python-26 -runtime/python-27 -runtime/python-34 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/cheetah/Makefile --- a/components/python/cheetah/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/cheetah/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ # Syntax issues: not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -62,6 +62,7 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += runtime/python-26/tests +REQUIRED_PACKAGES += runtime/python-27/tests +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/cheetah/resolve.deps --- a/components/python/cheetah/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -runtime/python-26 -runtime/python-26/tests -runtime/python-27 -runtime/python-27/tests -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/cherrypy/Makefile --- a/components/python/cherrypy/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/cherrypy/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -41,9 +41,9 @@ # This module is not Python 3 ready: syntax issues. PYTHON_VERSIONS = 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_POST_INSTALL_ACTION = \ (cd $(PROTO_DIR)/usr/bin ; $(MV) cherryd cherryd$(PYTHON_VERSION)) @@ -57,6 +57,4 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += system/core-os diff -r 60344306d223 -r 30b42c38bbc4 components/python/cherrypy/resolve.deps --- a/components/python/cherrypy/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -system/core-os diff -r 60344306d223 -r 30b42c38bbc4 components/python/cinderclient/Makefile --- a/components/python/cinderclient/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/cinderclient/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 17869 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -58,6 +58,3 @@ # test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/cinderclient/resolve.deps --- a/components/python/cinderclient/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/cliff/Makefile --- a/components/python/cliff/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/cliff/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 15998 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -50,6 +50,3 @@ # some of which haven't been integrated yet. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/cliff/resolve.deps --- a/components/python/cliff/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/cmd2/Makefile --- a/components/python/cmd2/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/cmd2/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 15996 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -47,6 +47,3 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/cmd2/resolve.deps --- a/components/python/cmd2/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/cov-core/Makefile --- a/components/python/cov-core/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/cov-core/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ # Depends on coverage, which is not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -50,6 +50,3 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/cov-core/resolve.deps --- a/components/python/cov-core/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/coverage/Makefile --- a/components/python/coverage/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/coverage/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -42,9 +42,9 @@ # builds and publishes fine with Python 3. PYTHON_VERSIONS = 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -58,6 +58,7 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/setuptools-26 +REQUIRED_PACKAGES += library/python/setuptools-27 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/coverage/resolve.deps --- a/components/python/coverage/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -library/python/setuptools-26 -library/python/setuptools-27 -runtime/python-26 -runtime/python-27 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/cssutils/Makefile --- a/components/python/cssutils/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/cssutils/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -40,9 +40,9 @@ # This module is not Python 3 ready: syntax issues. PYTHON_VERSIONS = 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_TEST_DIR= $(COMPONENT_SRC) COMPONENT_TEST_ARGS= ./setup.py test @@ -83,6 +83,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/cssutils/resolve.deps --- a/components/python/cssutils/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/d2to1/Makefile --- a/components/python/d2to1/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/d2to1/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -50,6 +50,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/d2to1/resolve.deps --- a/components/python/d2to1/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/decorator/Makefile --- a/components/python/decorator/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/decorator/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 13154 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -52,6 +52,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/decorator/resolve.deps --- a/components/python/decorator/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/django-appconf/Makefile --- a/components/python/django-appconf/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/django-appconf/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ # Depends on django, which is not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -51,6 +51,3 @@ # unittests require django-discover-runner which is not integrated test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/django-appconf/resolve.deps --- a/components/python/django-appconf/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/django/Makefile --- a/components/python/django/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/django/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ # Syntax issues: not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk # Replace "#!/usr/bin/env ..." shebang lines with properly versioned ones. COMPONENT_POST_BUILD_ACTION = \ @@ -75,6 +75,3 @@ # test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/django/resolve.deps --- a/components/python/django/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/django_compressor/Makefile --- a/components/python/django_compressor/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/django_compressor/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -37,9 +37,9 @@ # Depends on django, which is not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -50,7 +50,3 @@ # unittests require django-discover-runner which is not integrated test: $(NO_TESTS) - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/django_compressor/resolve.deps --- a/components/python/django_compressor/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/django_openstack_auth/Makefile --- a/components/python/django_openstack_auth/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/django_openstack_auth/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -37,9 +37,9 @@ # Depends on django, which is not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -50,7 +50,3 @@ # tests require mox which hasn't been integrated yet test: $(NO_TESTS) - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/django_openstack_auth/resolve.deps --- a/components/python/django_openstack_auth/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/dnspython/Makefile --- a/components/python/dnspython/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/dnspython/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -40,9 +40,9 @@ # Python3 PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -58,6 +58,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/dnspython/resolve.deps --- a/components/python/dnspython/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/dogpile.cache/Makefile --- a/components/python/dogpile.cache/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/dogpile.cache/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 17712 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -51,6 +51,3 @@ # of the CBE test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/dogpile.cache/resolve.deps --- a/components/python/dogpile.cache/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/dogpile.core/Makefile --- a/components/python/dogpile.core/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/dogpile.core/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 17259 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -54,6 +54,3 @@ # tests exit with a TypeError but they seem to complete ok test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/dogpile.core/resolve.deps --- a/components/python/dogpile.core/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/eventlet/Makefile --- a/components/python/eventlet/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/eventlet/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ # Depends on greenlet, which is not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -53,6 +53,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/eventlet/resolve.deps --- a/components/python/eventlet/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/filechunkio/Makefile --- a/components/python/filechunkio/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/filechunkio/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -50,6 +50,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/filechunkio/resolve.deps --- a/components/python/filechunkio/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/formencode/Makefile --- a/components/python/formencode/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/formencode/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ # Code explicitly checks for sys.version < '3.0' PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -58,6 +58,3 @@ # which haven't been integrated yet. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/formencode/resolve.deps --- a/components/python/formencode/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/glanceclient/Makefile --- a/components/python/glanceclient/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/glanceclient/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ # Depends on netaddr, which depends on ipython, which is not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -60,6 +60,3 @@ # test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/glanceclient/resolve.deps --- a/components/python/glanceclient/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/greenlet/Makefile --- a/components/python/greenlet/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/greenlet/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,8 +18,11 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # + +COMPILER = gcc + include ../../../make-rules/shared-macros.mk COMPONENT_NAME= greenlet @@ -38,13 +41,12 @@ # investigation. PYTHON_VERSIONS = 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) -COMPILER = gcc CC = $(COMPONENT_DIR)/CC.sh COMPONENT_PRE_BUILD_ACTION = \ @@ -67,6 +69,4 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/greenlet/resolve.deps --- a/components/python/greenlet/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/heatclient/Makefile --- a/components/python/heatclient/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/heatclient/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ # Depends on pyyaml which is not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -58,6 +58,3 @@ # testscenarios, and mox3 some of which have not been integrated. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/heatclient/resolve.deps --- a/components/python/heatclient/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/httplib2/Makefile --- a/components/python/httplib2/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/httplib2/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ # most likely work with Python 3. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -55,6 +55,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/httplib2/resolve.deps --- a/components/python/httplib2/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/imaging/Makefile --- a/components/python/imaging/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/imaging/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -40,9 +40,9 @@ # Syntax issues: not Python 3 ready. PYTHON_VERSIONS = 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk TEST_PYTHONPATH.32 = $(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/PIL TEST_PYTHONPATH.64 = $(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/PIL:$(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/PIL/64 @@ -60,6 +60,10 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += image/library/libjpeg +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += runtime/tcl-8 +REQUIRED_PACKAGES += runtime/tk-8 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/freetype-2 diff -r 60344306d223 -r 30b42c38bbc4 components/python/imaging/resolve.deps --- a/components/python/imaging/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -image/library/libjpeg -library/zlib -runtime/python-26 -runtime/python-27 -runtime/tcl-8 -runtime/tk-8 -system/library -system/library/freetype-2 diff -r 60344306d223 -r 30b42c38bbc4 components/python/importlib/Makefile --- a/components/python/importlib/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/importlib/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -38,9 +38,9 @@ # only deliver a 2.6 module. PYTHON_VERSIONS = 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -51,6 +51,3 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/importlib/resolve.deps --- a/components/python/importlib/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -runtime/python-26 diff -r 60344306d223 -r 30b42c38bbc4 components/python/ipython/Makefile --- a/components/python/ipython/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/ipython/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -40,9 +40,9 @@ # Syntax issues: not Python 3 ready. PYTHON_VERSIONS = 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk # Replace "#!/usr/bin/env ..." shebang lines with properly versioned ones. COMPONENT_PRE_BUILD_ACTION = \ @@ -62,6 +62,8 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/python-twisted-26 +REQUIRED_PACKAGES += library/python/python-twisted-27 +REQUIRED_PACKAGES += library/python/setuptools-26 +REQUIRED_PACKAGES += library/python/setuptools-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/ipython/resolve.deps --- a/components/python/ipython/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -library/python-2/python-twisted-26 -library/python-2/python-twisted-27 -library/python-2/setuptools-26 -library/python-2/setuptools-27 -library/python/python-twisted-26 -library/python/python-twisted-27 -library/python/setuptools-26 -library/python/setuptools-27 -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/iso8601/Makefile --- a/components/python/iso8601/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/iso8601/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 16616 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -50,6 +50,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/iso8601/resolve.deps --- a/components/python/iso8601/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/jinja2/Makefile --- a/components/python/jinja2/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/jinja2/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 19350 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -52,6 +52,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/jinja2/resolve.deps --- a/components/python/jinja2/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/jsonpatch/Makefile --- a/components/python/jsonpatch/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/jsonpatch/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -52,6 +52,3 @@ # jsonpatch has no tests. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/jsonpatch/resolve.deps --- a/components/python/jsonpatch/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/jsonpointer/Makefile --- a/components/python/jsonpointer/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/jsonpointer/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -52,6 +52,3 @@ # jsonpointer has no tests. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/jsonpointer/resolve.deps --- a/components/python/jsonpointer/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/jsonrpclib/Makefile --- a/components/python/jsonrpclib/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/jsonrpclib/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -42,9 +42,9 @@ # line can be removed when simplejson supports Python 3. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -58,6 +58,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/jsonrpclib/resolve.deps --- a/components/python/jsonrpclib/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/jsonschema/Makefile --- a/components/python/jsonschema/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/jsonschema/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -48,6 +48,3 @@ # Needs unittest2; enable when that becomes available. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/jsonschema/resolve.deps --- a/components/python/jsonschema/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/keystoneclient/Makefile --- a/components/python/keystoneclient/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/keystoneclient/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ # Depends on netaddr, which depends on ipython, which is not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -61,6 +61,3 @@ # test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/keystoneclient/resolve.deps --- a/components/python/keystoneclient/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/kombu/Makefile --- a/components/python/kombu/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/kombu/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ # dependencies resolved. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -55,6 +55,3 @@ # which haven't been integrated yet. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/kombu/resolve.deps --- a/components/python/kombu/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/ldtp/Makefile --- a/components/python/ldtp/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/ldtp/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -41,9 +41,9 @@ # Syntax issues: not Python 3 ready. PYTHON_VERSIONS = 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_POST_INSTALL_ACTION = \ (cd $(PROTO_DIR)/usr/bin ; $(MV) -f ldtp ldtp$(PYTHON_VERSION)) @@ -57,6 +57,3 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/ldtp/resolve.deps --- a/components/python/ldtp/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/lesscpy/Makefile --- a/components/python/lesscpy/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/lesscpy/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -40,9 +40,9 @@ # convert the 'j' in COMPONENT_VERSION to 10 IPS_COMPONENT_VERSION = 0.9.10 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -60,6 +60,3 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/lesscpy/resolve.deps --- a/components/python/lesscpy/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/librabbitmq/Makefile --- a/components/python/librabbitmq/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/librabbitmq/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ # This module is not Python 3 ready: syntax work needed. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -51,6 +51,4 @@ # librabbitmq tests fail to compile; more investigation is needed. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/librabbitmq/resolve.deps --- a/components/python/librabbitmq/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/lockfile/Makefile --- a/components/python/lockfile/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/lockfile/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -52,6 +52,3 @@ # test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/lockfile/resolve.deps --- a/components/python/lockfile/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/m2crypto/Makefile --- a/components/python/m2crypto/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/m2crypto/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -40,9 +40,9 @@ # Syntax issues: not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -59,6 +59,7 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += developer/swig +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/m2crypto/resolve.deps --- a/components/python/m2crypto/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -library/security/openssl -runtime/python-26 -runtime/python-27 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/mako/Makefile --- a/components/python/mako/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/mako/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -37,9 +37,9 @@ TPNO= 20425 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -52,7 +52,3 @@ install: $(INSTALL_NO_ARCH) test: $(TEST_NO_ARCH) - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/mako/resolve.deps --- a/components/python/mako/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/markdown/Makefile --- a/components/python/markdown/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/markdown/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 15143 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -54,6 +54,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/markdown/resolve.deps --- a/components/python/markdown/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/markupsafe/Makefile --- a/components/python/markupsafe/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/markupsafe/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -51,6 +51,5 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/markupsafe/resolve.deps --- a/components/python/markupsafe/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/mock/Makefile --- a/components/python/mock/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/mock/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -38,9 +38,9 @@ # it for Python 3. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_TEST_DIR = $(SOURCE_DIR) COMPONENT_TEST_ARGS = setup.py test @@ -54,6 +54,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/mock/resolve.deps --- a/components/python/mock/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/mysql/Makefile --- a/components/python/mysql/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/mysql/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -40,9 +40,9 @@ # Syntax issues: not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk PATH_32=/usr/mysql/5.5/bin/$(MACH32):/usr/bin:$(SPRO_VROOT)/bin PATH_64=/usr/mysql/5.5/bin:/usr/bin:$(SPRO_VROOT)/bin @@ -62,6 +62,9 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += database/mysql-55 +REQUIRED_PACKAGES += database/mysql-55/library +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/python/mysql/resolve.deps --- a/components/python/mysql/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -database/mysql-55/library -library/zlib -runtime/python-26 -runtime/python-27 -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/python/netaddr/Makefile --- a/components/python/netaddr/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/netaddr/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -39,9 +39,9 @@ # PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_POST_INSTALL_ACTION = \ (cd $(PROTOUSRBINDIR) ; $(MV) netaddr netaddr-$(PYTHON_VERSION)) @@ -71,6 +71,6 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/ipython-26 +REQUIRED_PACKAGES += library/python/ipython-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/netaddr/resolve.deps --- a/components/python/netaddr/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/python-2/ipython-26 -library/python-2/ipython-27 -library/python/ipython-26 -library/python/ipython-27 -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/netifaces/Makefile --- a/components/python/netifaces/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/netifaces/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ # Syntax issues: not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -52,6 +52,5 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/netifaces/resolve.deps --- a/components/python/netifaces/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/neutronclient/Makefile --- a/components/python/neutronclient/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/neutronclient/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ # Syntax issues: not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -61,6 +61,3 @@ # test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/neutronclient/resolve.deps --- a/components/python/neutronclient/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/nose-cover3/Makefile --- a/components/python/nose-cover3/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/nose-cover3/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ # Depends on coverage, which is not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -50,6 +50,3 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/nose-cover3/resolve.deps --- a/components/python/nose-cover3/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/nose/Makefile --- a/components/python/nose/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/nose/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -37,9 +37,9 @@ TPNO= 18083 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -84,8 +84,6 @@ install: $(INSTALL_NO_ARCH) -test: $(TEST_NO_ARCH) - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/setuptools-26 +REQUIRED_PACKAGES += library/python/setuptools-27 +REQUIRED_PACKAGES += library/python/setuptools-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/nose/resolve.deps --- a/components/python/nose/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/python/setuptools-26 -library/python/setuptools-27 -library/python/setuptools-34 -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/novaclient/Makefile --- a/components/python/novaclient/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/novaclient/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 17872 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -52,6 +52,3 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/novaclient/resolve.deps --- a/components/python/novaclient/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/ordereddict/Makefile --- a/components/python/ordereddict/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/ordereddict/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -38,9 +38,9 @@ # only deliver a 2.6 module. PYTHON_VERSIONS = 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -51,6 +51,3 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/ordereddict/resolve.deps --- a/components/python/ordereddict/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -runtime/python-26 diff -r 60344306d223 -r 30b42c38bbc4 components/python/oslo.config/Makefile --- a/components/python/oslo.config/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/oslo.config/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 17861 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_POST_INSTALL_ACTION += \ ($(TOUCH) $(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/oslo/__init__.py; \ @@ -56,6 +56,3 @@ # some of which haven't been integrated yet test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/oslo.config/resolve.deps --- a/components/python/oslo.config/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/passlib/Makefile --- a/components/python/passlib/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/passlib/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -50,6 +50,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/passlib/resolve.deps --- a/components/python/passlib/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/paste.deploy/Makefile --- a/components/python/paste.deploy/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/paste.deploy/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ # Depends on paste which is not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -50,6 +50,3 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/paste.deploy/resolve.deps --- a/components/python/paste.deploy/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/paste/Makefile --- a/components/python/paste/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/paste/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ # Syntax issues: not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -55,6 +55,3 @@ # are not installed. test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/paste/resolve.deps --- a/components/python/paste/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pbr/Makefile --- a/components/python/pbr/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pbr/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 17860 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -54,6 +54,3 @@ # Tests require tox and testr which haven't been integrated yet. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/pbr/resolve.deps --- a/components/python/pbr/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pep8/Makefile --- a/components/python/pep8/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pep8/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 20014 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk # Replace "#!/usr/bin/env ..." shebang lines with properly versioned ones. COMPONENT_PRE_BUILD_ACTION = \ @@ -73,6 +73,7 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/setuptools-26 +REQUIRED_PACKAGES += library/python/setuptools-27 +REQUIRED_PACKAGES += library/python/setuptools-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pep8/resolve.deps --- a/components/python/pep8/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/python/setuptools-26 -library/python/setuptools-27 -library/python/setuptools-34 -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pip/Makefile --- a/components/python/pip/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pip/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -19,7 +19,7 @@ # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -35,9 +35,9 @@ TPNO= 15181 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -54,6 +54,7 @@ # When these are available, update this directive to test pip. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/setuptools-26 +REQUIRED_PACKAGES += library/python/setuptools-27 +REQUIRED_PACKAGES += library/python/setuptools-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pip/resolve.deps --- a/components/python/pip/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/python/setuptools-26 -library/python/setuptools-27 -library/python/setuptools-34 -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/ply/Makefile --- a/components/python/ply/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/ply/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ # Syntax issues: not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -52,6 +52,3 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/ply/resolve.deps --- a/components/python/ply/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/prettytable/Makefile --- a/components/python/prettytable/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/prettytable/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -50,6 +50,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/prettytable/resolve.deps --- a/components/python/prettytable/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/py/Makefile --- a/components/python/py/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/py/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 15677 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_TEST_DIR = $(COMPONENT_SRC)/testing COMPONENT_TEST_CMD = /usr/bin/py.test @@ -52,6 +52,3 @@ # Tests require the pytest package to be installed. test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/py/resolve.deps --- a/components/python/py/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pyasn1-modules/Makefile --- a/components/python/pyasn1-modules/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pyasn1-modules/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14413 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_TEST_ENV += PATH=/usr/bin:$(SOURCE_DIR)/tools COMPONENT_TEST_CMD = $(SHELL) @@ -51,6 +51,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/pyasn1-modules/resolve.deps --- a/components/python/pyasn1-modules/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pyasn1/Makefile --- a/components/python/pyasn1/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pyasn1/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14413 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_TEST_DIR = $(SOURCE_DIR)/test COMPONENT_TEST_ARGS = suite.py @@ -50,6 +50,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/pyasn1/resolve.deps --- a/components/python/pyasn1/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pybonjour/Makefile --- a/components/python/pybonjour/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pybonjour/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 4453 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -54,6 +54,3 @@ # svc:/network/dns/multicast:default needs to be online for tests to run test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/pybonjour/resolve.deps --- a/components/python/pybonjour/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pycountry/Makefile --- a/components/python/pycountry/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pycountry/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -63,6 +63,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/pycountry/resolve.deps --- a/components/python/pycountry/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pycparser/Makefile --- a/components/python/pycparser/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pycparser/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 16938 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -61,6 +61,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/pycparser/resolve.deps --- a/components/python/pycparser/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pycups/Makefile --- a/components/python/pycups/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pycups/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -40,9 +40,9 @@ # Fails to compile: not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk # pycups requires VERSION to be defined. Originally set in the package Makefile CFLAGS += -DVERSION=\\\"$(COMPONENT_VERSION)\\\" @@ -59,6 +59,7 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/print/cups-libs +REQUIRED_PACKAGES += print/cups +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/pycups/resolve.deps --- a/components/python/pycups/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -library/print/cups-libs -runtime/python-26 -runtime/python-27 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/pycurl/Makefile --- a/components/python/pycurl/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pycurl/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -44,9 +44,9 @@ # Syntax issues: not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk # to make sure that the docs get installed in the right place. PYTHON_DATA = /usr @@ -60,6 +60,7 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += web/curl diff -r 60344306d223 -r 30b42c38bbc4 components/python/pycurl/resolve.deps --- a/components/python/pycurl/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -library/security/openssl -runtime/python-26 -runtime/python-27 -system/library -web/curl diff -r 60344306d223 -r 30b42c38bbc4 components/python/pydns/Makefile --- a/components/python/pydns/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pydns/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ # Import/syntax issues: not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_TEST_DIR = $(COMPONENT_SRC)/tests COMPONENT_TEST_ARGS = test.py @@ -53,6 +53,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/pydns/resolve.deps --- a/components/python/pydns/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pyflakes/Makefile --- a/components/python/pyflakes/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pyflakes/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_POST_INSTALL_ACTION += (cd $(PROTO_DIR)/usr/bin ; \ $(MV) -f pyflakes pyflakes-$(PYTHON_VERSION)) @@ -50,6 +50,7 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/setuptools-26 +REQUIRED_PACKAGES += library/python/setuptools-27 +REQUIRED_PACKAGES += library/python/setuptools-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pyflakes/resolve.deps --- a/components/python/pyflakes/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/python/setuptools-26 -library/python/setuptools-27 -library/python/setuptools-34 -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pygments/Makefile --- a/components/python/pygments/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pygments/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 15206 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -60,6 +60,7 @@ # test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/setuptools-26 +REQUIRED_PACKAGES += library/python/setuptools-27 +REQUIRED_PACKAGES += library/python/setuptools-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pygments/resolve.deps --- a/components/python/pygments/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/python/setuptools-26 -library/python/setuptools-27 -library/python/setuptools-34 -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pylxml/Makefile --- a/components/python/pylxml/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pylxml/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -42,9 +42,9 @@ studio_OPT.i386.32 = studio_OPT.i386.64 = -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -59,6 +59,8 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/libxml2 +REQUIRED_PACKAGES += library/libxslt +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/python/pylxml/resolve.deps --- a/components/python/pylxml/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -library/libxml2 -library/libxslt -runtime/python-26 -runtime/python-27 -runtime/python-34 -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/python/pyopenssl/Makefile --- a/components/python/pyopenssl/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pyopenssl/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 9207 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -57,6 +57,6 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/pyopenssl/resolve.deps --- a/components/python/pyopenssl/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -library/security/openssl -runtime/python-26 -runtime/python-27 -runtime/python-34 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/pyparsing/Makefile --- a/components/python/pyparsing/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pyparsing/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 15999 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -47,6 +47,3 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/pyparsing/resolve.deps --- a/components/python/pyparsing/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pyrabbit/Makefile --- a/components/python/pyrabbit/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pyrabbit/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ # for details). So don't build for Python 3 until dependencies resolved. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -53,6 +53,3 @@ # pyrabbit has no tests. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/pyrabbit/resolve.deps --- a/components/python/pyrabbit/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pytest-capturelog/Makefile --- a/components/python/pytest-capturelog/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pytest-capturelog/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -47,6 +47,3 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/pytest-capturelog/resolve.deps --- a/components/python/pytest-capturelog/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pytest-codecheckers/Makefile --- a/components/python/pytest-codecheckers/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pytest-codecheckers/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -47,6 +47,3 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/pytest-codecheckers/resolve.deps --- a/components/python/pytest-codecheckers/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pytest-cov/Makefile --- a/components/python/pytest-cov/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pytest-cov/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ # needs to be upgraded. Thus, skip Python 3 until then. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_TEST_DIR = $(COMPONENT_SRC) COMPONENT_TEST_ARGS = test_pytest_cov.py @@ -56,6 +56,3 @@ # Tests require the pytest, coverage and cov-core packages. test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/pytest-cov/resolve.deps --- a/components/python/pytest-cov/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pytest/Makefile --- a/components/python/pytest/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pytest/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_TEST_DIR = $(COMPONENT_SRC)/testing COMPONENT_TEST_CMD = $(PROTOUSRBINDIR)/py.test @@ -52,6 +52,7 @@ # Tests require the py package to be installed. test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/setuptools-26 +REQUIRED_PACKAGES += library/python/setuptools-27 +REQUIRED_PACKAGES += library/python/setuptools-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pytest/resolve.deps --- a/components/python/pytest/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/python/setuptools-26 -library/python/setuptools-27 -library/python/setuptools-34 -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/python-ldap/Makefile --- a/components/python/python-ldap/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/python-ldap/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ # This module has syntax issues and thus is not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -72,6 +72,10 @@ # test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/openldap +REQUIRED_PACKAGES += library/python/pyasn1-26 +REQUIRED_PACKAGES += library/python/pyasn1-27 +REQUIRED_PACKAGES += library/python/pyasn1-modules-26 +REQUIRED_PACKAGES += library/python/pyasn1-modules-27 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/python-ldap/resolve.deps --- a/components/python/python-ldap/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -library/openldap -library/python/pyasn1-26 -library/python/pyasn1-27 -library/python/pyasn1-modules-26 -library/python/pyasn1-modules-27 -runtime/python-26 -runtime/python-27 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/python-memcached/Makefile --- a/components/python/python-memcached/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/python-memcached/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -40,9 +40,9 @@ # Syntax errors: not Python 3 ready PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -64,6 +64,3 @@ # tests require local, online svc:/application/database/memcached:default test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/python-memcached/resolve.deps --- a/components/python/python-memcached/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/python26/Makefile --- a/components/python/python26/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/python26/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -36,10 +36,10 @@ TPNO= 9104 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk # Need to preserve timestamp for Grammar files. If the pickle files are older, # Python will try to rebuild them. @@ -140,6 +140,23 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += compress/bzip2 +REQUIRED_PACKAGES += database/sqlite-3 +REQUIRED_PACKAGES += developer/library/xprofile +REQUIRED_PACKAGES += library/database/gdbm +REQUIRED_PACKAGES += library/libffi +REQUIRED_PACKAGES += library/ncurses +REQUIRED_PACKAGES += library/python/tkinter-26 +REQUIRED_PACKAGES += library/readline +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += runtime/tcl-8 +REQUIRED_PACKAGES += runtime/tk-8 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += x11/compatibility/links-xorg +REQUIRED_PACKAGES += x11/library/libx11 diff -r 60344306d223 -r 30b42c38bbc4 components/python/python26/resolve.deps --- a/components/python/python26/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -compress/bzip2 -database/sqlite-3 -developer/library/xprofile -library/database/gdbm -library/libffi -library/ncurses -library/python-2/tkinter-26 -library/python/tkinter-26 -library/readline -library/security/openssl -library/zlib -runtime/python-26 -runtime/tcl-8 -runtime/tk-8 -shell/ksh93 -system/core-os -system/library -system/library/math -system/linker -x11/compatibility/links-xorg -x11/library/libx11 diff -r 60344306d223 -r 30b42c38bbc4 components/python/python27/Makefile --- a/components/python/python27/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/python27/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -38,10 +38,10 @@ TPNO= 20750 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk # Need to preserve timestamp for Grammar files. If the pickle files are older, # Python will try to rebuild them. @@ -185,6 +185,22 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += compress/bzip2 +REQUIRED_PACKAGES += database/sqlite-3 +REQUIRED_PACKAGES += developer/library/xprofile +REQUIRED_PACKAGES += library/database/gdbm +REQUIRED_PACKAGES += library/expat +REQUIRED_PACKAGES += library/libffi +REQUIRED_PACKAGES += library/ncurses +REQUIRED_PACKAGES += library/python/pip-27 +REQUIRED_PACKAGES += library/readline +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += runtime/tcl-8 +REQUIRED_PACKAGES += runtime/tk-8 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += x11/library/libx11 diff -r 60344306d223 -r 30b42c38bbc4 components/python/python27/resolve.deps --- a/components/python/python27/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -compress/bzip2 -database/sqlite-3 -developer/library/xprofile -library/database/gdbm -library/expat -library/libffi -library/ncurses -library/python/pip-27 -library/readline -library/security/openssl -library/zlib -runtime/python-27 -runtime/tcl-8 -runtime/tk-8 -shell/ksh93 -system/core-os -system/library -system/library/math -system/linker -x11/library/libx11 diff -r 60344306d223 -r 30b42c38bbc4 components/python/python34/Makefile --- a/components/python/python34/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/python34/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -37,10 +37,10 @@ TPNO= 19421 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk # Need to preserve timestamp for Grammar files. If the pickle files are older, # Python will try to rebuild them. @@ -182,6 +182,19 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += compress/bzip2 +REQUIRED_PACKAGES += compress/xz +REQUIRED_PACKAGES += database/sqlite-3 +REQUIRED_PACKAGES += library/database/gdbm +REQUIRED_PACKAGES += library/expat +REQUIRED_PACKAGES += library/libffi +REQUIRED_PACKAGES += library/ncurses +REQUIRED_PACKAGES += library/readline +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += runtime/tcl-8 +REQUIRED_PACKAGES += runtime/tk-8 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += x11/library/libx11 diff -r 60344306d223 -r 30b42c38bbc4 components/python/python34/resolve.deps --- a/components/python/python34/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -compress/bzip2 -compress/xz -database/sqlite-3 -library/database/gdbm -library/expat -library/libffi -library/ncurses -library/readline -library/security/openssl -library/zlib -runtime/tcl-8 -runtime/tk-8 -system/library -system/library/math -system/linker -x11/library/libx11 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pytz/Makefile --- a/components/python/pytz/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pytz/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 15417 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -54,6 +54,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/pytz/resolve.deps --- a/components/python/pytz/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pywbem/Makefile --- a/components/python/pywbem/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pywbem/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ # Syntax issues: not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -52,6 +52,3 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/pywbem/resolve.deps --- a/components/python/pywbem/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/pyyaml/Makefile --- a/components/python/pyyaml/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/pyyaml/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 9304 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -56,6 +56,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/pyyaml/resolve.deps --- a/components/python/pyyaml/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/quantumclient/Makefile --- a/components/python/quantumclient/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/quantumclient/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ # Depends on neutronclient which is not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -60,6 +60,3 @@ # test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/quantumclient/resolve.deps --- a/components/python/quantumclient/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/repoze.lru/Makefile --- a/components/python/repoze.lru/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/repoze.lru/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -50,6 +50,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/repoze.lru/resolve.deps --- a/components/python/repoze.lru/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/requests/Makefile --- a/components/python/requests/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/requests/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -49,6 +49,3 @@ # been integrated yet. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/requests/resolve.deps --- a/components/python/requests/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/routes/Makefile --- a/components/python/routes/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/routes/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -51,6 +51,3 @@ # which haven't been integrated yet. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/routes/resolve.deps --- a/components/python/routes/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/setuptools-git/Makefile --- a/components/python/setuptools-git/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/setuptools-git/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -49,7 +49,3 @@ install: $(INSTALL_NO_ARCH) test: $(TEST_NO_ARCH) - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/setuptools-git/resolve.deps --- a/components/python/setuptools-git/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/setuptools/Makefile --- a/components/python/setuptools/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/setuptools/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -35,9 +35,9 @@ TPNO= 17692 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -48,6 +48,3 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/setuptools/resolve.deps --- a/components/python/setuptools/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/simplejson/Makefile --- a/components/python/simplejson/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/simplejson/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -40,9 +40,9 @@ # Syntax issues: not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -64,6 +64,4 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/simplejson/resolve.deps --- a/components/python/simplejson/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/six/Makefile --- a/components/python/six/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/six/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 17859 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -51,6 +51,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/six/resolve.deps --- a/components/python/six/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/sqlalchemy-migrate/Makefile --- a/components/python/sqlalchemy-migrate/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/sqlalchemy-migrate/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -37,9 +37,9 @@ # Syntax issues: not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -60,6 +60,10 @@ # test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/decorator-26 +REQUIRED_PACKAGES += library/python/decorator-27 +REQUIRED_PACKAGES += library/python/setuptools-26 +REQUIRED_PACKAGES += library/python/setuptools-27 +REQUIRED_PACKAGES += library/python/sqlalchemy-26 +REQUIRED_PACKAGES += library/python/sqlalchemy-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/sqlalchemy-migrate/resolve.deps --- a/components/python/sqlalchemy-migrate/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -library/python/decorator-26 -library/python/decorator-27 -library/python/setuptools-26 -library/python/setuptools-27 -library/python/sqlalchemy-26 -library/python/sqlalchemy-27 -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/sqlalchemy/Makefile --- a/components/python/sqlalchemy/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/sqlalchemy/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -38,9 +38,9 @@ # enable it. See the README.py3k in the distro for details. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -55,6 +55,5 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/sqlalchemy/resolve.deps --- a/components/python/sqlalchemy/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/stevedore/Makefile --- a/components/python/stevedore/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/stevedore/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -50,6 +50,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/stevedore/resolve.deps --- a/components/python/stevedore/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/suds/Makefile --- a/components/python/suds/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/suds/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ # Import/syntax issues: not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -61,6 +61,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/suds/resolve.deps --- a/components/python/suds/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/swiftclient/Makefile --- a/components/python/swiftclient/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/swiftclient/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ # depends on keystoneclient which is not Python 3 ready PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -60,6 +60,6 @@ # test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/simplejson-26 +REQUIRED_PACKAGES += library/python/simplejson-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/swiftclient/resolve.deps --- a/components/python/swiftclient/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -library/python/simplejson-26 -library/python/simplejson-27 -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/tempita/Makefile --- a/components/python/tempita/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/tempita/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -47,6 +47,3 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/tempita/resolve.deps --- a/components/python/tempita/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/tox/Makefile --- a/components/python/tox/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/tox/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_POST_INSTALL_ACTION += (cd $(PROTO_DIR)/usr/bin ; \ $(MV) -f tox tox-$(PYTHON_VERSION); \ @@ -58,6 +58,7 @@ # Tests require py, pytest and virtualenv packages to be installed. test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/setuptools-26 +REQUIRED_PACKAGES += library/python/setuptools-27 +REQUIRED_PACKAGES += library/python/setuptools-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/tox/resolve.deps --- a/components/python/tox/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/python/setuptools-26 -library/python/setuptools-27 -library/python/setuptools-34 -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/troveclient/Makefile --- a/components/python/troveclient/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/troveclient/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ # Syntax errors: not Python 3 ready PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -60,6 +60,3 @@ # some of which have not been integrated. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/troveclient/resolve.deps --- a/components/python/troveclient/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/twisted-web2/Makefile --- a/components/python/twisted-web2/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/twisted-web2/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -40,9 +40,9 @@ # Depends on twisted, which is not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk # Master test results are the same for all versions of Python, so override # here, rather than create multiple identical master files. @@ -67,7 +67,3 @@ install: $(INSTALL_NO_ARCH) test: $(TEST_NO_ARCH) - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/twisted-web2/resolve.deps --- a/components/python/twisted-web2/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/twisted/Makefile --- a/components/python/twisted/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/twisted/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -40,9 +40,9 @@ # Syntax issues: not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_TEST_DIR= $(COMPONENT_SRC) COMPONENT_TEST_CMD= $(@D)/scripts-$(PYTHON_VERSION)/trial twisted @@ -78,6 +78,4 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/twisted/resolve.deps --- a/components/python/twisted/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/unittest2/Makefile --- a/components/python/unittest2/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/unittest2/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -38,9 +38,9 @@ # only deliver a 2.6 module. PYTHON_VERSIONS = 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -54,6 +54,5 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/setuptools-26 diff -r 60344306d223 -r 30b42c38bbc4 components/python/unittest2/resolve.deps --- a/components/python/unittest2/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -library/python-2/setuptools-26 -library/python/setuptools-26 -runtime/python-26 diff -r 60344306d223 -r 30b42c38bbc4 components/python/virtualenv/Makefile --- a/components/python/virtualenv/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/virtualenv/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -42,9 +42,9 @@ # confirm this. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -55,6 +55,6 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/setuptools-26 +REQUIRED_PACKAGES += library/python/setuptools-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/virtualenv/resolve.deps --- a/components/python/virtualenv/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/python-2/setuptools-26 -library/python-2/setuptools-27 -library/python/setuptools-26 -library/python/setuptools-27 -runtime/python-26 -runtime/python-27 diff -r 60344306d223 -r 30b42c38bbc4 components/python/waitress/Makefile --- a/components/python/waitress/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/waitress/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_POST_INSTALL_ACTION += (cd $(PROTO_DIR)/usr/bin ; \ $(MV) -f waitress-serve waitress-serve-$(PYTHON_VERSION)) @@ -54,6 +54,7 @@ # Tests requires the coverage, nose and unittest2 packages. test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/setuptools-26 +REQUIRED_PACKAGES += library/python/setuptools-27 +REQUIRED_PACKAGES += library/python/setuptools-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/waitress/resolve.deps --- a/components/python/waitress/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/python/setuptools-26 -library/python/setuptools-27 -library/python/setuptools-34 -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/warlock/Makefile --- a/components/python/warlock/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/warlock/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -51,6 +51,3 @@ # warlock tests require json{patch,schema,pointer} test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/warlock/resolve.deps --- a/components/python/warlock/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/webob/Makefile --- a/components/python/webob/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/webob/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 14503 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -50,6 +50,3 @@ test: $(TEST_NO_ARCH) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/webob/resolve.deps --- a/components/python/webob/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/websockify/Makefile --- a/components/python/websockify/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/websockify/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 16167 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -53,6 +53,7 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/setuptools-26 +REQUIRED_PACKAGES += library/python/setuptools-27 +REQUIRED_PACKAGES += library/python/setuptools-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/websockify/resolve.deps --- a/components/python/websockify/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/python/setuptools-26 -library/python/setuptools-27 -library/python/setuptools-34 -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/webtest/Makefile --- a/components/python/webtest/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/webtest/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ # Depends on paste.deploy, which depends on paste, which is not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_TEST_DIR= $(SOURCE_DIR) COMPONENT_TEST_ARGS= setup.py test @@ -55,6 +55,3 @@ # and cssselect. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/python/webtest/resolve.deps --- a/components/python/webtest/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -runtime/python-34 diff -r 60344306d223 -r 30b42c38bbc4 components/python/xattr/Makefile --- a/components/python/xattr/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/xattr/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 16912 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -82,6 +82,8 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/python/setuptools-26 +REQUIRED_PACKAGES += library/python/setuptools-27 +REQUIRED_PACKAGES += library/python/setuptools-34 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/xattr/resolve.deps --- a/components/python/xattr/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -library/python/setuptools-26 -library/python/setuptools-27 -library/python/setuptools-34 -runtime/python-26 -runtime/python-27 -runtime/python-34 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/zope-interface/Makefile --- a/components/python/zope-interface/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/python/zope-interface/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -40,9 +40,9 @@ # Syntax issues: not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/setup.py.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/setup.py.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -68,6 +68,4 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/python/zope-interface/resolve.deps --- a/components/python/zope-interface/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -runtime/python-26 -runtime/python-27 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/quagga/Makefile --- a/components/quagga/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/quagga/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -60,9 +60,9 @@ CFLAGS += -erroff=E_STATEMENT_NOT_REACHED CFLAGS += -erroff=E_EMPTY_TRANSLATION_UNIT -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += --with-cflags="$(CFLAGS)" CONFIGURE_OPTIONS += --enable-opaque-lsa @@ -79,12 +79,15 @@ CONFIGURE_OPTIONS += --enable-group=root CONFIGURE_OPTIONS += --enable-solaris -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - configure: $(CONFIGURE_32) build: $(BUILD_32) install: $(INSTALL_32) test: $(NO_TESTS) -include ../../make-rules/depend.mk + +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/network diff -r 60344306d223 -r 30b42c38bbc4 components/quagga/resolve.deps --- a/components/quagga/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -shell/ksh93 -system/core-os -system/library -system/library/math -system/network diff -r 60344306d223 -r 30b42c38bbc4 components/quilt/Makefile --- a/components/quilt/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/quilt/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ TPNO= 9108 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = \ ($(CLONEY) $(SOURCE_DIR) $(@D)) @@ -84,6 +84,15 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += archiver/gnu-tar +REQUIRED_PACKAGES += file/gnu-coreutils +REQUIRED_PACKAGES += file/gnu-findutils +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += service/network/smtp/sendmail +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += text/gawk +REQUIRED_PACKAGES += text/gnu-diffutils +REQUIRED_PACKAGES += text/gnu-grep +REQUIRED_PACKAGES += text/gnu-patch +REQUIRED_PACKAGES += text/gnu-sed diff -r 60344306d223 -r 30b42c38bbc4 components/quilt/resolve.deps --- a/components/quilt/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -archiver/gnu-tar -file/gnu-coreutils -file/gnu-findutils -runtime/perl-512 -service/network/smtp/sendmail -shell/bash -text/gawk -text/gnu-diffutils -text/gnu-grep -text/gnu-patch -text/gnu-sed diff -r 60344306d223 -r 30b42c38bbc4 components/rabbitmq/Makefile --- a/components/rabbitmq/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/rabbitmq/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 14503 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -62,8 +62,8 @@ test: $(TEST_32) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - PKG_PROTO_DIRS += $(COMPONENT_DIR)/files -include ../../make-rules/depend.mk + +REQUIRED_PACKAGES += runtime/erlang +REQUIRED_PACKAGES += shell/ksh93 diff -r 60344306d223 -r 30b42c38bbc4 components/rabbitmq/resolve.deps --- a/components/rabbitmq/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/erlang -shell/ksh93 diff -r 60344306d223 -r 30b42c38bbc4 components/rdiff-backup/Makefile --- a/components/rdiff-backup/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/rdiff-backup/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -19,7 +19,7 @@ # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ # Syntax issues: not Python 3 ready. PYTHON_VERSIONS= 2.7 2.6 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/setup.py.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/setup.py.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -53,6 +53,6 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/librsync +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/rdiff-backup/resolve.deps --- a/components/rdiff-backup/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -library/librsync -runtime/python-26 -runtime/python-27 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/readline/Makefile --- a/components/readline/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/readline/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -37,10 +37,10 @@ TPNO= 9042 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk LINT_FLAGS += -I$(PROTO_DIR)/usr/include @@ -75,6 +75,5 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/readline/resolve.deps --- a/components/readline/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/rpm2cpio/Makefile --- a/components/rpm2cpio/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/rpm2cpio/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -39,13 +39,13 @@ TPNO= 17824 -include ../../make-rules/prep.mk +include $(WS_MAKE_RULES)/prep.mk # Do not clean the sources (set in prep.mk) # CLEAN_PATHS= -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/ips.mk CLEAN_PATHS+= $(BUILD_DIR) @@ -64,6 +64,5 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += runtime/perl-512 diff -r 60344306d223 -r 30b42c38bbc4 components/rpm2cpio/resolve.deps --- a/components/rpm2cpio/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -runtime/perl-512 diff -r 60344306d223 -r 30b42c38bbc4 components/rsync/Makefile --- a/components/rsync/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/rsync/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 16940 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" CONFIGURE_OPTIONS += SHELL_PATH=/bin/sh @@ -59,6 +59,5 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/rsync/resolve.deps --- a/components/rsync/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/rsyslog/Makefile --- a/components/rsyslog/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/rsyslog/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,8 +18,11 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # + +COMPILER = gcc + include ../../make-rules/shared-macros.mk COMPONENT_NAME= rsyslog @@ -33,11 +36,9 @@ TPNO= 7585 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk - -COMPILER = gcc +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # This is needed for things to be built correctly. CONFIGURE_ENV += CFLAGS="$(CFLAGS)" @@ -65,9 +66,17 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - PKG_PROTO_DIRS += $(COMPONENT_DIR)/files PKG_PROTO_DIRS += $(COMPONENT_SRC) -include ../../make-rules/depend.mk + +REQUIRED_PACKAGES += file/gnu-coreutils +REQUIRED_PACKAGES += library/gnutls +REQUIRED_PACKAGES += library/libee +REQUIRED_PACKAGES += library/libestr +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/gcc-3-runtime +REQUIRED_PACKAGES += system/library/gcc-45-runtime +REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime diff -r 60344306d223 -r 30b42c38bbc4 components/rsyslog/resolve.deps --- a/components/rsyslog/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -file/gnu-coreutils -library/gnutls -library/libee -library/libestr -library/zlib -shell/ksh93 -system/library -system/library/gcc-3-runtime -system/library/gcc-45-runtime -system/library/gcc/gcc-c-runtime diff -r 60344306d223 -r 30b42c38bbc4 components/rtorrent/Makefile --- a/components/rtorrent/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/rtorrent/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -41,9 +41,9 @@ TPNO= 8824 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = \ ($(CLONEY) $(SOURCE_DIR) $(@D)) @@ -82,6 +82,10 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/c++/sigcpp +REQUIRED_PACKAGES += library/libtorrent +REQUIRED_PACKAGES += library/ncurses +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += web/curl diff -r 60344306d223 -r 30b42c38bbc4 components/rtorrent/resolve.deps --- a/components/rtorrent/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -library/c++/sigcpp -library/libtorrent -library/ncurses -system/library -system/library/c++-runtime -system/library/math -web/curl diff -r 60344306d223 -r 30b42c38bbc4 components/ruby/facter/Makefile --- a/components/ruby/facter/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/ruby/facter/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -38,9 +38,9 @@ COMPONENT_POST_UNPACK_ACTION= \ $(GEM) spec $(COMPONENT_ARCHIVE) > $(SOURCE_DIR)/$(GEMSPEC) -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/gem.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/gem.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -54,6 +54,6 @@ # Disable the tests until these rubygems are available. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += runtime/ruby-19 +REQUIRED_PACKAGES += system/core-os diff -r 60344306d223 -r 30b42c38bbc4 components/ruby/facter/resolve.deps --- a/components/ruby/facter/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/ruby-19 -system/core-os diff -r 60344306d223 -r 30b42c38bbc4 components/ruby/hiera/Makefile --- a/components/ruby/hiera/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/ruby/hiera/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -38,9 +38,9 @@ COMPONENT_POST_UNPACK_ACTION= \ $(GEM) spec $(COMPONENT_ARCHIVE) > $(SOURCE_DIR)/$(GEMSPEC) -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/gem.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/gem.mk ASLR_MODE = $(ASLR_NOT_APPLICABLE) @@ -50,6 +50,6 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += runtime/ruby-19 +REQUIRED_PACKAGES += system/core-os diff -r 60344306d223 -r 30b42c38bbc4 components/ruby/hiera/resolve.deps --- a/components/ruby/hiera/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -runtime/ruby-19 -system/core-os diff -r 60344306d223 -r 30b42c38bbc4 components/ruby/puppet/Makefile --- a/components/ruby/puppet/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/ruby/puppet/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 18128 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/install.rb.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/install.rb.mk +include $(WS_MAKE_RULES)/ips.mk # puppet requires facter and hiera as part of the install phase COMPONENT_INSTALL_ENV += RUBYLIB="$(COMPONENT_DIR)/../facter/build/$(MACH64)/lib:$(COMPONENT_DIR)/../hiera/build/$(MACH64)/lib" @@ -74,6 +74,12 @@ # Disable the tests until these rubygems are available. test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += runtime/ruby-19 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += system/network diff -r 60344306d223 -r 30b42c38bbc4 components/ruby/puppet/resolve.deps --- a/components/ruby/puppet/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -runtime/ruby-19 -shell/ksh93 -system/core-os -system/library -system/library/gcc/gcc-c-runtime -system/library/math -system/linker -system/network diff -r 60344306d223 -r 30b42c38bbc4 components/ruby/ruby-19/Makefile --- a/components/ruby/ruby-19/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/ruby/ruby-19/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -41,9 +41,9 @@ TPNO= 15969 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/configure.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/configure.mk # COMPONENT_VERSION .. # is transformed into . for RUBY_VER. @@ -147,8 +147,6 @@ CLEAN_PATHS += Solaris/gem.1 Solaris/rbconfig.sedscript.mod \ Solaris/ruby.1.sedscript.mod -include $(WS_TOP)/make-rules/shared-targets.mk - # common targets configure: $(CONFIGURE_64) @@ -159,6 +157,16 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/database/gdbm +REQUIRED_PACKAGES += library/libffi +REQUIRED_PACKAGES += library/ncurses +REQUIRED_PACKAGES += library/readline +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += runtime/tcl-8 +REQUIRED_PACKAGES += runtime/tk-8 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += x11/library/libx11 diff -r 60344306d223 -r 30b42c38bbc4 components/ruby/ruby-19/resolve.deps --- a/components/ruby/ruby-19/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -library/database/gdbm -library/libffi -library/ncurses -library/readline -library/security/openssl -library/zlib -runtime/tcl-8 -runtime/tk-8 -system/core-os -system/library -system/library/math -system/linker -x11/library/libx11 diff -r 60344306d223 -r 30b42c38bbc4 components/ruby/ruby-common/Makefile --- a/components/ruby/ruby-common/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/ruby/ruby-common/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -28,16 +28,11 @@ COMPONENT_PROJECT_URL= http://www.ruby-lang.org/ COMPONENT_BUGDB= utility/ruby -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk - -# This package delivers no files and has no dependencies. -EXTDEPFILES = $(NULLDEPFILE) -LICENSE_TRANSFORMS= +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # nothing to download or build; just publish the package -download prep configure build install test: - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) +download:: +prep configure build install test: clobber: clean diff -r 60344306d223 -r 30b42c38bbc4 components/samba/mozldap/Makefile --- a/components/samba/mozldap/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/samba/mozldap/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -33,8 +33,8 @@ sha256:ec9884b56b31961d287190323764af7f3b00ad2658d5f3005fa8dc71c637e54c COMPONENT_ARCHIVE_URL= ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE) -include ../../../make-rules/prep.mk -include ../../../make-rules/configure.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk # Define a private space PATCH_LEVEL = 0 @@ -75,8 +75,6 @@ build: $(BUILD_32_and_64) -include ../../../make-rules/shared-targets.mk - # mozldap proto looks to ugly after "gmake install ..." # so some cleanup is needed COMPONENT_POST_INSTALL_ACTION = \ @@ -88,7 +86,3 @@ install: $(INSTALL_32_and_64) test: $(NO_TESTS) - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../../make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/samba/samba/Makefile --- a/components/samba/samba/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/samba/samba/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,9 +20,17 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # +# Samba does not work properly on i86 when built by studio. +# Samba on SPARC has serious performance drop when built by gcc. +ifeq ($(uname -p),sparc) +COMPILER = studio +else +COMPILER = gcc +endif + include ../../../make-rules/shared-macros.mk COMPONENT_NAME= samba @@ -48,23 +56,15 @@ sha256:4324f2c4a9ba94f1165c5922f166636621681b09d635257d921f6df654e7191e COMPONENT_ARCHIVE_URL_2= http://hub.opensolaris.org/bin/download/Project+samqfs/files/libsam%2DLGPL.tar -# Samba does not work properly on i86 when built by studio. -# Samba on SPARC has serious performance drop when built by gcc. -ifeq ($(MACH), sparc) -COMPILER = studio -else -COMPILER = gcc -endif - -include ../../../make-rules/prep.mk +include $(WS_MAKE_RULES)/prep.mk SRC_OFFSET = source3 # Now we override paths to .built BUILD_DIR_32 = $(BUILD_DIR)/$(MACH32)/$(SRC_OFFSET) BUILD_DIR_64 = $(BUILD_DIR)/$(MACH64)/$(SRC_OFFSET) -include ../../../make-rules/configure.mk -include ../../../make-rules/ips.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_SCRIPT = $(BUILD_DIR_$(BITS))/configure @@ -110,6 +110,8 @@ COMPONENT_PRE_CONFIGURE_ACTION += \ ( cd $(@D) ; $(CONFIG_SHELL) autogen.sh ) +COMPONENT_PRE_BUILD_ACTION = $(ENV) ; echo $(COMPONENT_BUILD_ENV) + # Depend on $(PROTO_DIR)/.mozldap because this target creates $(PROTO_DIR). $(PROTO_DIR)/opt/SUNWsamfs/lib/libsam.so: Solaris/libsam.c \ $(COMPONENT_ARCHIVE_2) $(PROTO_DIR)/.mozldap @@ -226,8 +228,6 @@ build: $(BUILD_32_and_64) -include ../../../make-rules/shared-targets.mk - install: $(PROTO_DIR)/etc/samba/smb.conf-example $(INSTALL_32_and_64) test: $(NO_TESTS) @@ -235,6 +235,23 @@ clean:: $(GMAKE) -C $(COMPONENT_DIR)/../mozldap clean -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../../make-rules/depend.mk +REQUIRED_PACKAGES += library/file-monitor/gamin +REQUIRED_PACKAGES += library/ncurses +REQUIRED_PACKAGES += library/popt +REQUIRED_PACKAGES += library/print/cups-libs +REQUIRED_PACKAGES += library/readline +REQUIRED_PACKAGES += library/samba/libsmbclient +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/perl-516 +REQUIRED_PACKAGES += service/security/kerberos-5 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/gcc-3-runtime +REQUIRED_PACKAGES += system/library/gcc-45-runtime +REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime +REQUIRED_PACKAGES += system/library/security/crypto +REQUIRED_PACKAGES += system/library/security/gss +REQUIRED_PACKAGES += system/network +REQUIRED_PACKAGES += system/network/avahi diff -r 60344306d223 -r 30b42c38bbc4 components/samba/samba/resolve.deps --- a/components/samba/samba/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -library/file-monitor/gamin -library/ncurses -library/popt -library/print/cups-libs -library/readline -library/samba/libsmbclient -library/zlib -runtime/perl-512 -runtime/perl-516 -service/security/kerberos-5 -shell/ksh93 -system/core-os -system/library -system/library/gcc-3-runtime -system/library/gcc-45-runtime -system/library/gcc/gcc-c-runtime -system/library/security/gss -system/network -system/network/avahi -system/library/security/crypto diff -r 60344306d223 -r 30b42c38bbc4 components/samba/samba30/Makefile --- a/components/samba/samba30/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/samba/samba30/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -45,13 +45,13 @@ TPNO_LIBSMBCLIENT= 17765 TPNO_MOZLDAP= 4457 -include ../../../make-rules/prep.mk +include $(WS_MAKE_RULES)/prep.mk SRC_OFFSET = source BUILD_DIR_32 = $(BUILD_DIR)/$(MACH32)/$(SRC_OFFSET) -include ../../../make-rules/configure.mk -include ../../../make-rules/ips.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_SCRIPT = $(BUILD_DIR_32)/configure @@ -145,8 +145,6 @@ build: $(BUILD_32) -include ../../../make-rules/shared-targets.mk - install: $(INSTALL_32) test: $(NO_TESTS) @@ -154,6 +152,8 @@ clean:: $(GMAKE) -C $(COMPONENT_DIR)/../mozldap clean -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../../make-rules/depend.mk +REQUIRED_PACKAGES += library/nspr +REQUIRED_PACKAGES += library/openldap +REQUIRED_PACKAGES += library/security/nss +REQUIRED_PACKAGES += service/security/kerberos-5 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/samba/samba30/resolve.deps --- a/components/samba/samba30/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -library/nspr -library/openldap -library/security/nss -service/security/kerberos-5 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/sane-backends/Makefile --- a/components/sane-backends/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/sane-backends/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 8865 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += --disable-locking CONFIGURE_OPTIONS += --sysconfdir=/etc @@ -50,6 +50,11 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += image/library/libjpeg +REQUIRED_PACKAGES += image/library/libtiff +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/library/usb/libusb +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/sane-backends/resolve.deps --- a/components/sane-backends/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -image/library/libjpeg -image/library/libtiff -shell/ksh93 -system/library -system/library/math -system/library/usb/libusb -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/sane-frontends/Makefile --- a/components/sane-frontends/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/sane-frontends/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 8865 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += --with-sane-prefix=/usr CONFIGURE_OPTIONS += --disable-sanetest @@ -53,6 +53,12 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += image/editor/gimp +REQUIRED_PACKAGES += image/scanner/xsane/sane-backends +REQUIRED_PACKAGES += library/desktop/gtk2 +REQUIRED_PACKAGES += library/glib2 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += x11/library/libx11 +REQUIRED_PACKAGES += x11/library/libxcursor diff -r 60344306d223 -r 30b42c38bbc4 components/sane-frontends/resolve.deps --- a/components/sane-frontends/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -image/editor/gimp -image/scanner/xsane/sane-backends -library/desktop/gtk2 -library/glib2 -system/library -system/library/math -x11/library/libx11 -x11/library/libxcursor diff -r 60344306d223 -r 30b42c38bbc4 components/screen/Makefile --- a/components/screen/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/screen/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 8940 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += --enable-colors256 CONFIGURE_OPTIONS += --with-sys-screenrc=/etc/screenrc @@ -63,6 +63,5 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/screen/resolve.deps --- a/components/screen/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/sed/Makefile --- a/components/sed/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/sed/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 12595 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR) CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" @@ -56,6 +56,5 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/sed/resolve.deps --- a/components/sed/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/sendmail/Makefile --- a/components/sendmail/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/sendmail/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -35,10 +35,10 @@ TPNO= 7435 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk # Although we build 32_and_64, everything except libmilter just wants 64, # which is why the macros just below only have values for 64. libmilter @@ -136,6 +136,12 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += database/berkeleydb-5 +REQUIRED_PACKAGES += library/libmilter +REQUIRED_PACKAGES += library/openldap +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/network diff -r 60344306d223 -r 30b42c38bbc4 components/sendmail/resolve.deps --- a/components/sendmail/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -database/berkeleydb-5 -library/libmilter -library/openldap -library/security/openssl -runtime/perl-512 -shell/ksh93 -system/core-os -system/library -system/network diff -r 60344306d223 -r 30b42c38bbc4 components/sg3_utils/Makefile --- a/components/sg3_utils/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/sg3_utils/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 17711 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CPPFLAGS += -I$(COMPONENT_DIR)/$(COMPONENT_SRC)/include @@ -70,6 +70,5 @@ test: $(TEST_32) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/sg3_utils/resolve.deps --- a/components/sg3_utils/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/slang/Makefile --- a/components/slang/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/slang/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -37,9 +37,9 @@ TPNO= 8995 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = $(CLONEY) $(SOURCE_DIR) $(@D) CONFIGURE_SCRIPT = $(@D)/configure @@ -68,6 +68,10 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += image/library/libpng +REQUIRED_PACKAGES += library/pcre +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/slang/resolve.deps --- a/components/slang/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -image/library/libpng -library/pcre -library/zlib -system/core-os -system/library -system/library/math -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/slib/Makefile --- a/components/slib/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/slib/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # # @@ -41,8 +41,8 @@ TPNO= 5839 -include ../../make-rules/prep.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk # Lie to IPS packaging about the version because it doesn't like # COMPONENT_VERSION's with letters. @@ -64,6 +64,5 @@ clean:: $(RM) -r $(BUILD_DIR) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += shell/bash diff -r 60344306d223 -r 30b42c38bbc4 components/slib/resolve.deps --- a/components/slib/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -shell/bash diff -r 60344306d223 -r 30b42c38bbc4 components/slrn/Makefile --- a/components/slrn/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/slrn/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -36,9 +36,9 @@ COMPONENT_BUGDB= utility/slrn TPNO= 21410 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = $(CLONEY) $(SOURCE_DIR) $(@D) CONFIGURE_SCRIPT = $(@D)/configure @@ -68,6 +68,6 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/slang +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/slrn/resolve.deps --- a/components/slrn/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -library/security/openssl -library/slang -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/smp_utils/Makefile --- a/components/smp_utils/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/smp_utils/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 11065 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CC += $(CC_BITS) @@ -114,6 +114,5 @@ test: install $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/smp_utils/resolve.deps --- a/components/smp_utils/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/snort/Makefile --- a/components/snort/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/snort/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 19385 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PATCH_LEVEL = 0 @@ -83,6 +83,19 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += developer/lexer/flex +REQUIRED_PACKAGES += developer/parser/bison +REQUIRED_PACKAGES += library/pcre +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/security/openssl/openssl-fips-140 +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/libdaq +REQUIRED_PACKAGES += system/library/libdnet +REQUIRED_PACKAGES += system/library/libpcap +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += system/network diff -r 60344306d223 -r 30b42c38bbc4 components/snort/resolve.deps --- a/components/snort/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -library/pcre -library/security/openssl -library/security/openssl/openssl-fips-140 -library/zlib -shell/ksh93 -system/core-os -system/library -system/library/libdaq -system/library/libdnet -system/library/libpcap -system/library/math -system/linker -system/network diff -r 60344306d223 -r 30b42c38bbc4 components/sox/Makefile --- a/components/sox/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/sox/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 9040 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += --disable-static CONFIGURE_OPTIONS += --disable-gomp @@ -54,6 +54,13 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += codec/flac +REQUIRED_PACKAGES += codec/ogg-vorbis +REQUIRED_PACKAGES += image/library/libpng +REQUIRED_PACKAGES += library/audio/pulseaudio +REQUIRED_PACKAGES += library/libsndfile +REQUIRED_PACKAGES += library/libtool/libltdl +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/sox/resolve.deps --- a/components/sox/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -codec/flac -codec/ogg-vorbis -image/library/libpng -library/audio/pulseaudio -library/libsndfile -library/libtool/libltdl -library/zlib -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/spawn-fcgi/Makefile --- a/components/spawn-fcgi/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/spawn-fcgi/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 9041 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_ENV += CFLAGS="$(CFLAGS)" @@ -54,6 +54,5 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/spawn-fcgi/resolve.deps --- a/components/spawn-fcgi/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/squid/Makefile --- a/components/squid/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/squid/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,9 +20,11 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # +COMPILER = gcc + include ../../make-rules/shared-macros.mk PATH=/usr/bin:/usr/gnu/bin:/usr/sbin:/usr/perl5/bin @@ -39,11 +41,9 @@ TPNO= 13323 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk - -COMPILER = gcc +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CXX += $(CC_BITS) @@ -139,6 +139,18 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/libtool/libltdl +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/perl-516 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime +REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/library/security/crypto +REQUIRED_PACKAGES += system/library/security/gss +REQUIRED_PACKAGES += system/library/security/libsasl +REQUIRED_PACKAGES += system/network diff -r 60344306d223 -r 30b42c38bbc4 components/squid/resolve.deps --- a/components/squid/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -library/libtool/libltdl -library/security/openssl -runtime/perl-512 -runtime/perl-516 -shell/ksh93 -system/core-os -system/library -system/library/gcc/gcc-c-runtime -system/library/gcc/gcc-c++-runtime -system/library/math -system/library/security/crypto -system/library/security/gss -system/library/security/libsasl -system/network diff -r 60344306d223 -r 30b42c38bbc4 components/stdcxx/Makefile --- a/components/stdcxx/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/stdcxx/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # # we really need to use studio so we don't like that @@ -44,9 +44,9 @@ CLOBBER_PATHS += install.sh -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk ISA_PATCH_DIR_32 = $(WS_TOP)/components/stdcxx/isa_patches/$(MACH) ISA_PATCH_DIR_64 = $(WS_TOP)/components/stdcxx/isa_patches/$(MACH64) @@ -277,6 +277,7 @@ $(RM) -r $(COMPONENT_SRC) $(COMPONENT_SRC)-32 $(COMPONENT_SRC)-64 $(RM) -f *.sed *.out -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/stdcxx/resolve.deps --- a/components/stdcxx/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -system/library -system/library/c++-runtime -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/stunnel/Makefile --- a/components/stunnel/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/stunnel/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -38,9 +38,9 @@ COMPONENT_BUGDB= utility/stunnel TPNO= 21367 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # need /usr/perl5/bin on path to access pod2man perl script, used by # the build to create docs @@ -78,6 +78,8 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += system/network diff -r 60344306d223 -r 30b42c38bbc4 components/stunnel/resolve.deps --- a/components/stunnel/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -library/security/openssl -system/core-os -system/library -system/linker -system/network diff -r 60344306d223 -r 30b42c38bbc4 components/subversion/Makefile --- a/components/subversion/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/subversion/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ TPNO= 9086 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PATCH_LEVEL = 0 PYMODS = client core delta fs ra repos wc @@ -168,6 +168,14 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += database/sqlite-3 +REQUIRED_PACKAGES += developer/versioning/subversion +REQUIRED_PACKAGES += library/apr-15 +REQUIRED_PACKAGES += library/apr-util-15 +REQUIRED_PACKAGES += library/expat +REQUIRED_PACKAGES += library/neon +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/security/gss diff -r 60344306d223 -r 30b42c38bbc4 components/subversion/resolve.deps --- a/components/subversion/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -database/sqlite-3 -developer/versioning/subversion -library/apr-15 -library/apr-util-15 -library/expat -library/neon -library/zlib -system/library -system/library/c++-runtime -system/library/security/gss diff -r 60344306d223 -r 30b42c38bbc4 components/sudo/Makefile --- a/components/sudo/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/sudo/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -19,7 +19,7 @@ # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -38,9 +38,9 @@ TPNO= 16733 -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PREP_ACTION = ( cd $(@D) ; $(AUTORECONF) -f -I m4 ) @@ -103,6 +103,7 @@ VISUDO=$(BUILD_DIR_64)/plugins/sudoers/visudo test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/security/crypto diff -r 60344306d223 -r 30b42c38bbc4 components/sudo/resolve.deps --- a/components/sudo/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -library/zlib -system/library -system/library/security/crypto diff -r 60344306d223 -r 30b42c38bbc4 components/swig/Makefile --- a/components/swig/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/swig/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -34,9 +34,9 @@ TPNO= 10991 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PATH=$(SPRO_VROOT)/bin:$(JAVA_HOME)/bin:/usr/bin @@ -77,6 +77,9 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/pcre +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/swig/resolve.deps --- a/components/swig/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -library/pcre -library/zlib -system/library -system/library/c++-runtime -system/library/math -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/tcl/expect/Makefile --- a/components/tcl/expect/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/tcl/expect/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 5552 -include ../../../make-rules/prep.mk -include ../../../make-rules/configure.mk -include ../../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk SCRIPTS = timed-run timed-read ftp-rfc autopasswd lpunlock weather \ passmass rftp kibitz rlogin-cwd xpstat tkpasswd dislocate xkibitz \ @@ -78,6 +78,9 @@ $(CONFIGURE_64): ../tcl/build/$(MACH64)/.built -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../../make-rules/depend.mk +REQUIRED_PACKAGES += runtime/tcl-8 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/tcl/expect/resolve.deps --- a/components/tcl/expect/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -runtime/tcl-8 -shell/ksh93 -system/library -system/library/math -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/tcl/tcl/Makefile --- a/components/tcl/tcl/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/tcl/tcl/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 9083 -include ../../../make-rules/prep.mk -include ../../../make-rules/configure.mk -include ../../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PREP_ACTION = \ (cd $(SOURCE_DIR)/unix ; autoreconf -f; \ @@ -81,6 +81,7 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/tcl/tcl/resolve.deps --- a/components/tcl/tcl/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -system/library -system/library/math -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/tcl/tk/Makefile --- a/components/tcl/tk/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/tcl/tk/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 16968 -include ../../../make-rules/prep.mk -include ../../../make-rules/configure.mk -include ../../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PREP_ACTION = \ (cd $(@D)/unix ; autoreconf -f) @@ -87,6 +87,11 @@ $(CONFIGURE_32): ../tcl/build/$(MACH32)/.built $(CONFIGURE_64): ../tcl/build/$(MACH64)/.built -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../../make-rules/depend.mk +REQUIRED_PACKAGES += runtime/tcl-8 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += x11/library/libx11 +REQUIRED_PACKAGES += x11/library/libxext +REQUIRED_PACKAGES += x11/library/libxft diff -r 60344306d223 -r 30b42c38bbc4 components/tcl/tk/resolve.deps --- a/components/tcl/tk/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -runtime/tcl-8 -system/library -system/library/math -system/linker -x11/library/libx11 -x11/library/libxext -x11/library/libxft diff -r 60344306d223 -r 30b42c38bbc4 components/tcltls/Makefile --- a/components/tcltls/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/tcltls/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -35,9 +35,9 @@ TPNO= 5697 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_ENV += $(CONFIGURE_ENV.$(BITS)) CONFIGURE_ENV.64 += MACH64DIR="$(MACH64)" @@ -61,6 +61,6 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/tcltls/resolve.deps --- a/components/tcltls/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -library/security/openssl -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/tcpdump/Makefile --- a/components/tcpdump/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/tcpdump/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 16021 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # fix my alignment issues instead of falling over on sparc studio_ALIGN.sparc.64=-xmemalign=16i @@ -67,6 +67,6 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/libpcap diff -r 60344306d223 -r 30b42c38bbc4 components/tcpdump/resolve.deps --- a/components/tcpdump/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -system/library -system/library/libpcap diff -r 60344306d223 -r 30b42c38bbc4 components/tcsh/Makefile --- a/components/tcsh/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/tcsh/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -38,9 +38,9 @@ TPNO= 5688 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = \ ($(CLONEY) $(SOURCE_DIR) $(@D)) @@ -71,8 +71,8 @@ install: $(INSTALL_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - test: $(TEST_64) -include ../../make-rules/depend.mk + +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += text/locale diff -r 60344306d223 -r 30b42c38bbc4 components/tcsh/resolve.deps --- a/components/tcsh/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/texinfo/Makefile --- a/components/texinfo/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/texinfo/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -35,9 +35,9 @@ TPNO_TEXINFO= 7876 TPNO_TEXI2HTML= 9089 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk INFOPATH := /usr/share/info INFOPATH := $(INFOPATH):/usr/sfw/share/info @@ -62,6 +62,12 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/ncurses +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/python-26 +REQUIRED_PACKAGES += runtime/python-27 +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/texinfo/resolve.deps --- a/components/texinfo/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -library/ncurses -runtime/perl-512 -runtime/python-26 -runtime/python-27 -shell/bash -shell/ksh93 -system/core-os -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/text-utilities/Makefile --- a/components/text-utilities/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/text-utilities/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -35,9 +35,9 @@ TPNO= 17825 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # We currently only want some of the text-utils text utilities from this # component, so enumerate it in a macro that we can use for build and install. @@ -101,6 +101,5 @@ test: install $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/text-utilities/resolve.deps --- a/components/text-utilities/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/tidy/Makefile --- a/components/tidy/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/tidy/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -37,10 +37,10 @@ TPNO= 9098 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk #tree.js, treeview.js, tidyenum_8h.html are installed #from files directory manually as doxygen didn't generate them. @@ -83,6 +83,5 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += developer/documentation-tool/doxygen +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/tidy/resolve.deps --- a/components/tidy/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/timezone/Makefile --- a/components/timezone/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/timezone/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -37,16 +37,13 @@ factory northamerica pacificnew \ southamerica backward -include ../../make-rules/ips.mk - -# This package delivers only data files and has no dependencies. -EXTDEPFILES = $(NULLDEPFILE) +include $(WS_MAKE_RULES)/ips.mk POFILE=zoneinfo.po ASLR_MODE = $(ASLR_NOT_APPLICABLE) -download: +download:: @echo "Nothing to download." prep: @@ -65,5 +62,3 @@ $(RM) -r $(BUILD_DIR) $(POFILE) clobber: clean - -include ../../make-rules/depend.mk diff -r 60344306d223 -r 30b42c38bbc4 components/tmux/Makefile --- a/components/tmux/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/tmux/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -39,9 +39,9 @@ TPNO= 20510 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" CONFIGURE_OPTIONS += CXXFLAGS="$(CXXFLAGS)" @@ -65,6 +65,7 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/libevent +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/tmux/resolve.deps --- a/components/tmux/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -library/libevent -shell/ksh93 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/tomcat/Makefile --- a/components/tomcat/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/tomcat/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -52,9 +52,9 @@ TPNO= 17997 -include ../../make-rules/prep.mk -include ../../make-rules/ant.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ant.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_BUILD_ARGS=-Dbase.path=$(BUILD_DIR_32) -Dtomcat.build=$(PROTO_DIR) COMPONENT_BUILD_TARGETS=download deploy @@ -77,6 +77,8 @@ test: $(TEST_32) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += runtime/java/jre-7 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/network diff -r 60344306d223 -r 30b42c38bbc4 components/tomcat/resolve.deps --- a/components/tomcat/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -runtime/java/jre-7 -shell/ksh93 -system/core-os -system/network diff -r 60344306d223 -r 30b42c38bbc4 components/top/Makefile --- a/components/top/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/top/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 5701 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk IPS_COMPONENT_VERSION = 3.8 @@ -54,8 +54,8 @@ install: $(INSTALL_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - test: $(NO_TESTS) -include ../../make-rules/depend.mk + +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/top/resolve.deps --- a/components/top/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/tree/Makefile --- a/components/tree/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/tree/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -36,9 +36,9 @@ TPNO= 9095 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk # Enable ASLR for this component ASLR_MODE = $(ASLR_ENABLE) @@ -61,6 +61,4 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/tree/resolve.deps --- a/components/tree/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/trousers/Makefile --- a/components/trousers/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/trousers/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -35,10 +35,10 @@ TPNO= 8341 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk PATCH_LEVEL=0 @@ -96,6 +96,11 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += developer/build/automake-110 +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/security/openssl/openssl-fips-140 +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/core-os +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/network diff -r 60344306d223 -r 30b42c38bbc4 components/trousers/resolve.deps --- a/components/trousers/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -library/security/openssl -shell/ksh93 -system/core-os -system/library -system/network diff -r 60344306d223 -r 30b42c38bbc4 components/unixodbc/Makefile --- a/components/unixodbc/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/unixodbc/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ COMPONENT_ARCHIVE_URL= http://ftp.unixodbc.org/pub/unixODBC/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= library/unixodbc -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PATCH_LEVEL = 0 @@ -124,7 +124,9 @@ test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) + -include ../../make-rules/depend.mk - +REQUIRED_PACKAGES += library/libtool/libltdl +REQUIRED_PACKAGES += library/readline +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/unixodbc/resolve.deps --- a/components/unixodbc/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -library/libtool/libltdl -library/readline -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/unrar/Makefile --- a/components/unrar/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/unrar/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -39,9 +39,9 @@ TPNO= 18537 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk PKG_PROTO_DIRS = $(MANGLED_DIR) PKG_PROTO_DIRS += $(BUILD_DIR_64) @@ -72,6 +72,7 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/unrar/resolve.deps --- a/components/unrar/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -system/library -system/library/c++-runtime -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/unzip/Makefile --- a/components/unzip/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/unzip/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -19,7 +19,7 @@ # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 16388 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk # remove the unwanted file. COMPONENT_PREP_ACTION = $(RM) $(SOURCE_DIR)/crc_i386.S @@ -67,6 +67,6 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/unzip/resolve.deps --- a/components/unzip/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -shell/ksh93 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/vim/Makefile --- a/components/vim/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/vim/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -40,9 +40,9 @@ COMPONENT_BUGDB= utility/vim -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk HGREPODIR= $(COMPONENT_NAME).hg TARBALLDIR= $(COMPONENT_NAME)-$(COMPONENT_HG_REV) @@ -145,6 +145,17 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/desktop/gdk-pixbuf +REQUIRED_PACKAGES += library/desktop/gtk2 +REQUIRED_PACKAGES += library/desktop/pango +REQUIRED_PACKAGES += library/glib2 +REQUIRED_PACKAGES += library/ncurses +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += x11/library/libice +REQUIRED_PACKAGES += x11/library/libsm +REQUIRED_PACKAGES += x11/library/libx11 +REQUIRED_PACKAGES += x11/library/libxcursor +REQUIRED_PACKAGES += x11/library/toolkit/libxt diff -r 60344306d223 -r 30b42c38bbc4 components/vim/resolve.deps --- a/components/vim/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -library/desktop/gdk-pixbuf -library/desktop/gtk2 -library/desktop/pango -library/glib2 -library/ncurses -shell/ksh93 -system/library -system/library/math -x11/library/libice -x11/library/libsm -x11/library/libx11 -x11/library/libxcursor -x11/library/toolkit/libxt diff -r 60344306d223 -r 30b42c38bbc4 components/w3m/Makefile --- a/components/w3m/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/w3m/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,6 +20,9 @@ # # Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # + +COMPILER = gcc + include ../../make-rules/shared-macros.mk COMPONENT_NAME= w3m @@ -34,11 +37,9 @@ TPNO= 9364 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk - -COMPILER = gcc +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PREP_ACTION = (cd $(@D) ; aclocal-1.11 ; autoconf) @@ -71,6 +72,13 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/desktop/gdk-pixbuf +REQUIRED_PACKAGES += library/gc +REQUIRED_PACKAGES += library/glib2 +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/security/openssl/openssl-fips-140 +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += x11/library/libx11 diff -r 60344306d223 -r 30b42c38bbc4 components/w3m/resolve.deps --- a/components/w3m/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -library/desktop/gdk-pixbuf -library/gc -library/glib2 -library/security/openssl -library/security/openssl/openssl-fips-140 -library/zlib -runtime/perl-512 -system/library -system/library/math -x11/library/libx11 diff -r 60344306d223 -r 30b42c38bbc4 components/wdiff/Makefile --- a/components/wdiff/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/wdiff/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 7092 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += CC="$(CC) -m64" CONFIGURE_OPTIONS += --enable-experimental @@ -55,6 +55,6 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += text/gnu-diffutils diff -r 60344306d223 -r 30b42c38bbc4 components/wdiff/resolve.deps --- a/components/wdiff/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -system/library -text/gnu-diffutils diff -r 60344306d223 -r 30b42c38bbc4 components/webalizer/Makefile --- a/components/webalizer/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/webalizer/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,9 +20,11 @@ # # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # +COMPILER = gcc + include ../../make-rules/shared-macros.mk COMPONENT_NAME= webalizer @@ -38,9 +40,9 @@ TPNO= 9201 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk COMPONENT_PRE_CONFIGURE_ACTION = \ ($(CLONEY) $(SOURCE_DIR) $(@D)) @@ -50,8 +52,6 @@ $(GSED) -i -e 's?lib/httpd/logs/?apache2/2.2/logs/?' \ $(SOURCE_DIR)/sample.conf -COMPILER = gcc - CONFIGURE_OPTIONS += --enable-dns CONFIGURE_OPTIONS += --with-gd=/usr/include/gd2 CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" @@ -76,6 +76,9 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += database/berkeleydb-5 +REQUIRED_PACKAGES += library/gd +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/webalizer/resolve.deps --- a/components/webalizer/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -database/berkeleydb-5 -library/gd -library/zlib -system/library -system/library/math diff -r 60344306d223 -r 30b42c38bbc4 components/wget/Makefile --- a/components/wget/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/wget/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -34,9 +34,9 @@ TPNO= 19782 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Enforce wget binary to standard path CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin @@ -85,6 +85,10 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/libidn +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/linker +REQUIRED_PACKAGES += text/texinfo diff -r 60344306d223 -r 30b42c38bbc4 components/wget/resolve.deps --- a/components/wget/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -library/libidn -library/security/openssl -library/zlib -system/library -system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/which/Makefile --- a/components/which/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/which/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -34,9 +34,9 @@ TPNO= 9202 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin @@ -55,8 +55,15 @@ install: $(INSTALL_64) -test: $(NO_TESTS) +test: $(TEST_64) + +REQUIRED_PACKAGES += system/library +# Auto-generated contents below. Please manually verify and remove this comment -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) +REQUIRED_PACKAGES += system/library +# Auto-generated contents below. Please manually verify and remove this comment -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library +# Auto-generated contents below. Please manually verify and remove this comment + +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/which/resolve.deps --- a/components/which/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/wireshark/Makefile --- a/components/wireshark/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/wireshark/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -34,9 +34,9 @@ TPNO= 21136 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # Micro version for easy libraries packaging MICRO_VERSION:= $(shell echo $(COMPONENT_VERSION) | awk -F. '{ print $$3 }') @@ -85,6 +85,22 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += developer/lexer/flex +REQUIRED_PACKAGES += developer/parser/bison +REQUIRED_PACKAGES += diagnostic/wireshark/wireshark-common +REQUIRED_PACKAGES += library/desktop/cairo +REQUIRED_PACKAGES += library/desktop/gdk-pixbuf +REQUIRED_PACKAGES += library/desktop/gtk2 +REQUIRED_PACKAGES += library/desktop/pango +REQUIRED_PACKAGES += library/glib2 +REQUIRED_PACKAGES += library/gnutls +REQUIRED_PACKAGES += library/security/libgpg-error +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += runtime/lua +REQUIRED_PACKAGES += service/security/kerberos-5 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/libpcap +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/library/security/libgcrypt +REQUIRED_PACKAGES += x11/library/libx11 +REQUIRED_PACKAGES += x11/library/libxcursor diff -r 60344306d223 -r 30b42c38bbc4 components/wireshark/resolve.deps --- a/components/wireshark/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -diagnostic/wireshark/wireshark-common -library/desktop/cairo -library/desktop/gdk-pixbuf -library/desktop/gtk2 -library/desktop/pango -library/glib2 -library/gnutls -library/security/libgpg-error -library/zlib -runtime/lua -service/security/kerberos-5 -system/library -system/library/libpcap -system/library/math -system/library/security/libgcrypt -x11/library/libx11 -x11/library/libxcursor diff -r 60344306d223 -r 30b42c38bbc4 components/wxwidgets/Makefile --- a/components/wxwidgets/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/wxwidgets/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 9216 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk PKG_PROTO_DIRS += $(COMPONENT_DIR)/man @@ -70,8 +70,6 @@ CONFIGURE_OPTIONS += CXXFLAGS="$(CXXFLAGS)" CONFIGURE_OPTIONS += LDFLAGS="$(LDFLAGS)" -include ../../make-rules/shared-targets.mk - # I want to use userland's "build" target in contrib subdirectory, but I need # to skip the configure phase $(BUILD_DIR_32)/contrib/.configured \ @@ -91,6 +89,23 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += image/library/libjpeg +REQUIRED_PACKAGES += image/library/libpng +REQUIRED_PACKAGES += image/library/libtiff +REQUIRED_PACKAGES += library/desktop/atk +REQUIRED_PACKAGES += library/desktop/gdk-pixbuf +REQUIRED_PACKAGES += library/desktop/gtk2 +REQUIRED_PACKAGES += library/desktop/pango +REQUIRED_PACKAGES += library/expat +REQUIRED_PACKAGES += library/glib2 +REQUIRED_PACKAGES += library/sdl +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += x11/library/libsm +REQUIRED_PACKAGES += x11/library/libx11 +REQUIRED_PACKAGES += x11/library/libxcursor +REQUIRED_PACKAGES += x11/library/libxinerama +REQUIRED_PACKAGES += x11/library/libxxf86vm diff -r 60344306d223 -r 30b42c38bbc4 components/wxwidgets/resolve.deps --- a/components/wxwidgets/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -image/library/libjpeg -image/library/libpng -image/library/libtiff -library/desktop/atk -library/desktop/gdk-pixbuf -library/desktop/gtk2 -library/desktop/pango -library/expat -library/glib2 -library/sdl -library/zlib -shell/ksh93 -system/library -system/library/c++-runtime -system/library/math -x11/library/libsm -x11/library/libx11 -x11/library/libxcursor -x11/library/libxinerama -x11/library/libxxf86vm diff -r 60344306d223 -r 30b42c38bbc4 components/xmlto/Makefile --- a/components/xmlto/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/xmlto/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,9 +37,9 @@ TPNO= 13394 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk # These will be used by the xmlto script. CONFIGURE_ENV += FIND="/usr/gnu/bin/find" @@ -60,6 +60,12 @@ test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += file/gnu-coreutils +REQUIRED_PACKAGES += file/gnu-findutils +REQUIRED_PACKAGES += library/libxml2 +REQUIRED_PACKAGES += library/libxslt +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += shell/gnu-getopt +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += text/gnu-grep diff -r 60344306d223 -r 30b42c38bbc4 components/xmlto/resolve.deps --- a/components/xmlto/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -file/gnu-coreutils -file/gnu-findutils -library/libxml2 -library/libxslt -shell/bash -shell/gnu-getopt -system/library -text/gnu-grep diff -r 60344306d223 -r 30b42c38bbc4 components/xorriso/Makefile --- a/components/xorriso/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/xorriso/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ CPPFLAGS+= -I./test -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += --enable-shared CONFIGURE_OPTIONS += --disable-static @@ -58,6 +58,7 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/readline +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/xorriso/resolve.deps --- a/components/xorriso/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -library/readline -library/zlib -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/xz/Makefile --- a/components/xz/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/xz/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -34,9 +34,9 @@ TPNO= 4463 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" @@ -60,12 +60,11 @@ build: $(BUILD_32_and_64) -include ../../make-rules/shared-targets.mk +include $(WS_MAKE_RULES)/shared-targets.mk install: $(INSTALL_32_and_64) test: $(TEST_32_and_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/xz/resolve.deps --- a/components/xz/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -shell/bash -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/zip/Makefile --- a/components/zip/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/zip/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -19,7 +19,7 @@ # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -36,9 +36,9 @@ TPNO= 17905 -include ../../make-rules/prep.mk -include ../../make-rules/justmake.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/justmake.mk +include $(WS_MAKE_RULES)/ips.mk # remove the unwanted file. COMPONENT_PREP_ACTION = rm -f $(SOURCE_DIR)/match.S @@ -63,6 +63,6 @@ test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += compress/bzip2 +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/zip/resolve.deps --- a/components/zip/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -compress/bzip2 -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/zlib/Makefile --- a/components/zlib/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/zlib/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -37,10 +37,10 @@ TPNO= 17611 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk -include ../../make-rules/lint-libraries.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/lint-libraries.mk # # We want to build hardware specific versions of the longest_match() @@ -117,6 +117,5 @@ clean:: $(RM) -r $(BUILD_DIR) $(PROTO_DIR) capabilities/*/*/*.o capabilities/*/$(MACH32)/*.s -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += system/library diff -r 60344306d223 -r 30b42c38bbc4 components/zlib/resolve.deps --- a/components/zlib/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -system/library diff -r 60344306d223 -r 30b42c38bbc4 components/zsh/Makefile --- a/components/zsh/Makefile Mon Feb 16 13:54:04 2015 -0800 +++ b/components/zsh/Makefile Sun Feb 15 19:02:09 2015 -0600 @@ -20,11 +20,11 @@ # # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk -include ../../make-rules/shared-targets.mk +include $(WS_MAKE_RULES)/shared-targets.mk COMPONENT_NAME= zsh COMPONENT_VERSION= 5.0.7 @@ -38,9 +38,9 @@ TPNO= 19477 -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk CONFIGURE_OPTIONS += -n CONFIGURE_OPTIONS += --bindir=/usr/bin @@ -110,6 +110,8 @@ # build does this always test: $(TEST_64) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk +REQUIRED_PACKAGES += library/ncurses +REQUIRED_PACKAGES += library/pcre +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += system/linker diff -r 60344306d223 -r 30b42c38bbc4 components/zsh/resolve.deps --- a/components/zsh/resolve.deps Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -library/ncurses -library/pcre -system/library -system/library/math -system/linker diff -r 60344306d223 -r 30b42c38bbc4 doc/makefile-targets.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/makefile-targets.txt Sun Feb 15 19:02:09 2015 -0600 @@ -0,0 +1,105 @@ + +This is a guide to explain various useful targets in Userland component +Makefiles. There is a set of targets that all Makefiles must include, plus +some addtional targets that are there for convenience. + +component-environment-check:: + This target is an optional target that will be included in most Makefiles + automatically. It is defined in $(WS_MAKE_RULES)/environment.mk which is + included by $(WS_MAKE_RULES)/shares-macros.mk. It reports on some interesting + information about the current environment and whether or not it is suitable + to build, publish, or test the component. + +component-environment-prep:: + This target is an optional target that will be included in most Makefiles + automatically. It is defined in $(WS_MAKE_RULES)/environment.mk which is + included by $(WS_MAKE_RULES)/shares-macros.mk. It uses the REQUIRE_PACKAGES + macro contents to attempt to install any required packages in the current + environment. It should never by used by developers to update any public + build machines as those are managed by dedicated staff. + +download:: + This target must be present in all Makefiles. It can be used at the top level + to act across all components, or on an individual component basis. It is + typically defined by including $(WS_MAKE_RULES)/prep.mk in your component + Makefile. This target depends on your component Makefile, so changes to your + component Makefile will automatically trigger a re-download and subsequent + build steps that depend on it. You can use the MAKEFILE_PREREQ macro to + override this behaviour and avoid rebuilding with each Makefile change. This + macro should only be used in the calling environment via something like: + $ gmake MAKEFILE_PREREQ= install + +prep:: + This target must be present in all Makefiles. It can be used at the top level + to act across all components, or on an individual component basis. It is + typically defined by including $(WS_MAKE_RULES)/prep.mk in your component + Makefile. It depends on the previously described "download" target, as well + as internal interum targets to unpack source archives and apply patches to + the unpacked source. + +configure: + This target is an optional target that can be included in component Makefiles + to run the community source configuration phase of a component build. It is + typically defined in component Makefiles that make use of the + $(WS_MAKE_RULES)/configure.mk Makefile fragment, but could be defined in + others that include a source code configuration step. It is not explicitly + called during the build, but provides a convenient means of downloading, + unpacking, patching, and "configuring" component source for building without + actually compiling the bits. + +build:: + This target must be present in all Makefiles. It can be used at the top level + to act across all components, or on an individual component basis. It is + defined in the individual component Makefiles, but most Makefile fragments + under $(WS_MAKE_RULES) include targets that allow the definitions to depend + on one of several convenience macros $(BUILD_32), $(BUILD_64), + $(BUILD_32_and_64), and $(BUILD_NO_ARCH) to build 32-bit support, 64-bit + support, both 32 and 64 bit support, or architecture neutral support. The + macro used will depend on the component. + +install:: + This target must be present in all Makefiles. It can be used at the top level + to act across all components, or on an individual component basis. It is + defined in the individual component Makefiles, but most Makefile fragments + under $(WS_MAKE_RULES) include targets that allow the definitions to depend + on one of several convenience macros $(INSTALL_32), $(INSTALL_64), + $(INSTALL_32_and_64), and $(INSTALL_NO_ARCH) to install 32-bit support, 64-bit + support, both 32 and 64 bit support, or architecture neutral support. The + macro used will depend on the component and corresponds to the build target + macro used. + +pkglint:: + This target is an optional target is automatically defined in each Makefile + by the inclusion of $(WS_MAKE_RULES)/prep.mk. It will run the build steps + necessary to pkglint the manifests for a component. + +publish:: + This target must be present in all Makefiles. It can be used at the top level + to act across all components, or on an individual component basis. It is + often automatically defined by including $(WS_MAKE_RULES)/prep.mk. It depends + on the previously described 'install' target and will perform a series of + internal, intermediate steps to use the component package manifests to + generate and publish packages for that component. + +clean:: + This target must be present in all Makefiles. It can be used at the top level + to act across all components, or on an individual component basis. It is + often automatically defined by including one of the $(WS_MAKE_RULES) + Makefile fragments. It cleans up any files created by building the component + with the exception of any downloaded files. + +clobber:: + This target must be present in all Makefiles. It can be used at the top level + to act across all components, or on an individual component basis. It is + often automatically defined by including one of the $(WS_MAKE_RULES) + Makefile fragments. It depends on the previously described 'clean' target + and additionally cleans up any downloaded source archives. + +REQUIRED_PACKAGES:: + This target is present in all component Makefiles. It is automatically + defined by including $(WS_MAKE_RULES)/ips.mk. It is a convenience that can + be used to generate the set of REQUIRED_PACKAGES that is needed by the + 'pkgdepend resolve' portion of package generation and publication (publish + target). It automatically appends to the component Makefile, but the results + should be + manually verified. diff -r 60344306d223 -r 30b42c38bbc4 doc/makefile-variables.txt --- a/doc/makefile-variables.txt Mon Feb 16 13:54:04 2015 -0800 +++ b/doc/makefile-variables.txt Sun Feb 15 19:02:09 2015 -0600 @@ -32,6 +32,8 @@ done before you 'hg commit' your merge. * COMPONENT_BUGDB is the lower-case rendering of the BugDB cat/subcat. +* REQUIRED_PACKAGES is a list of packages required to build or run the + component and its tests. These two are both initialized in make-rules/shared-macros.mk rather than any component-level Makefile, but are frequently referenced from the latter. diff -r 60344306d223 -r 30b42c38bbc4 doc/packaging.txt --- a/doc/packaging.txt Mon Feb 16 13:54:04 2015 -0800 +++ b/doc/packaging.txt Sun Feb 15 19:02:09 2015 -0600 @@ -143,26 +143,11 @@ The resolution step is also set up to use the -e flag to pkgdepend resolve, which limits the set of packages it looks at to resolve the dependencies it generated in the previous step. This makes the resolution step a great deal - faster, but requires that you keep a static list of these packages checked - into the workspace, and update it when packages are added to it. Having - extra packages in there is safe. - - In order to create this list, build and publish your component (or at least - through the resolution stage) without a file "resolve.deps" in the component - directory, and run "gmake sample-resolve.deps". If the file is empty (that - is, no computed dependencies were found), a warning will be emitted and the - file will be removed, as pkgdepend currently errors out in that case. If a - component has no dependencies that pkgdepend can discover and resolve, you - can set EXTDEPFILES = $(NULLDEPFILE) in your component Makefile to get the - performance benefits without providing a placeholder resolve.deps yourself. - - To test, run "gmake clean" and re-publish. - - Don't forget to "hg add resolve.deps"! - - Note that there is a possibility the list of dependencies will be different - on different architectures, so you should run this on both sparc and x86, - and combine the two lists. Please keep the files sorted. + faster, but requires that you include a static list of these packages in + your component Makefile REQUIRED_PACKAGES macro. You can automatically + add REQURIED_PACKAGES settings for the packages used in dependency + resolution by running "gmake REQUIRED_PACKAGES". Once you have done so, + you should manually verify the Makefile additions. Manifest Validation The resolved manifest(s) and prototype install tree are passed through diff -r 60344306d223 -r 30b42c38bbc4 make-rules/ant.mk --- a/make-rules/ant.mk Mon Feb 16 13:54:04 2015 -0800 +++ b/make-rules/ant.mk Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # ANT=/usr/bin/ant @@ -84,3 +84,5 @@ clean:: $(RM) -r $(SOURCE_DIR) $(BUILD_DIR) + +REQUIRED_PACKAGES += developer/build/ant diff -r 60344306d223 -r 30b42c38bbc4 make-rules/attpackagemake.mk --- a/make-rules/attpackagemake.mk Mon Feb 16 13:54:04 2015 -0800 +++ b/make-rules/attpackagemake.mk Sun Feb 15 19:02:09 2015 -0600 @@ -18,13 +18,13 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. # # # Rules and Macros for building opens source software that uses AT&T's package # tool. # -# To use these rules, include ../make-rules/attpackagemake.mk in your Makefile +# To use these rules, include $(WS_MAKE_RULES)/attpackagemake.mk in your Makefile # and define "build", "install" targets appropriate to building your component. # Ex: # diff -r 60344306d223 -r 30b42c38bbc4 make-rules/build-zone.mk --- a/make-rules/build-zone.mk Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,143 +0,0 @@ -# -# 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) 2010, Oracle and/or its affiliates. All rights reserved. -# - -# -# Rules and Macros for creating a template build zone from the installed system -# and a set of build zones that are clones of the template build zone. -# -# To use these rules to create a template build zone -# $ gmake -f make-rules/build-zone.mk template-build-zone -# -# To use these rules to clone the template zone -# $ gmake -f make-rules/build-zone.mk build-zone-[1-9] -# or -# $ gmake -f make-rules/build-zone.mk \ -# /rpool/zones/build-zone-{*}/root/etc/sysidcfg -# -# Before you create any cloned build zones, it is recommended that you create -# the template build zone, boot it, and make any customizations to it first. -# The act of booting the template zone will cause it to perform any "first boot" -# tasks that might othwise slow down the initial boot of a new build zone. -# Also, all customizations of the template zone will only propagate to the build -# zones when they are created. -# - -ZONECFG = /usr/sbin/zonecfg -ZONEADM = /usr/sbin/zoneadm -TZ= $(shell sed -e '/^TZ=/!d' -e 's;TZ=;;' /etc/default/init) - -ZONESCFG_DIR = /etc/zones -BUILD_ZONE_SPACE = /rpool/zones - -TOUCH = /usr/bin/touch - -SYSIDCFG = root/etc/sysidcfg -ZI_TAG = root/.installed - -# the name of the template build zone -TMPL_ZONE_NAME = template-build-zone - -# -# The template build zone will start with 'entire' installed. We include -# additional packages to make the build zones more closely match most -# components' build requirements. This makes build zone preparation quicker. -# -#TMPL_ZONE_TOOLS += developer/gcc-3 -#TMPL_ZONE_TOOLS += developer/gnu-binutils -#TMPL_ZONE_TOOLS += developer/sunstudio12u1 -TMPL_ZONE_TOOLS += archiver/gnu-tar -TMPL_ZONE_TOOLS += compress/p7zip -TMPL_ZONE_TOOLS += compress/unzip -TMPL_ZONE_TOOLS += developer/build/ant -TMPL_ZONE_TOOLS += developer/build/autoconf -TMPL_ZONE_TOOLS += developer/build/automake-110 -TMPL_ZONE_TOOLS += developer/build/gnu-make -TMPL_ZONE_TOOLS += developer/build/libtool -TMPL_ZONE_TOOLS += developer/build/make -TMPL_ZONE_TOOLS += developer/gnome/gettext -TMPL_ZONE_TOOLS += developer/java/jdk -TMPL_ZONE_TOOLS += developer/lexer/flex -TMPL_ZONE_TOOLS += developer/macro/cpp -TMPL_ZONE_TOOLS += developer/macro/gnu-m4 -TMPL_ZONE_TOOLS += developer/object-file -TMPL_ZONE_TOOLS += developer/parser/bison -TMPL_ZONE_TOOLS += file/gnu-coreutils -TMPL_ZONE_TOOLS += file/gnu-findutils -TMPL_ZONE_TOOLS += library/libxslt -TMPL_ZONE_TOOLS += library/pcre -TMPL_ZONE_TOOLS += text/gawk -TMPL_ZONE_TOOLS += text/gnu-diffutils -TMPL_ZONE_TOOLS += text/gnu-gettext -TMPL_ZONE_TOOLS += text/gnu-grep -TMPL_ZONE_TOOLS += text/gnu-patch -TMPL_ZONE_TOOLS += text/gnu-sed -TMPL_ZONE_TOOLS += text/groff -TMPL_ZONE_TOOLS += text/texinfo - -TMPL_ZONE_PKGS = $(TMPL_ZONE_TOOLS) - -template-build-zone: $(BUILD_ZONE_SPACE)/$(TMPL_ZONE_NAME)/$(SYSIDCFG) -build-zone-1: $(BUILD_ZONE_SPACE)/build-zone-1/$(SYSIDCFG) -build-zone-2: $(BUILD_ZONE_SPACE)/build-zone-2/$(SYSIDCFG) -build-zone-3: $(BUILD_ZONE_SPACE)/build-zone-3/$(SYSIDCFG) -build-zone-4: $(BUILD_ZONE_SPACE)/build-zone-4/$(SYSIDCFG) -build-zone-5: $(BUILD_ZONE_SPACE)/build-zone-5/$(SYSIDCFG) -build-zone-6: $(BUILD_ZONE_SPACE)/build-zone-6/$(SYSIDCFG) -build-zone-7: $(BUILD_ZONE_SPACE)/build-zone-7/$(SYSIDCFG) -build-zone-8: $(BUILD_ZONE_SPACE)/build-zone-8/$(SYSIDCFG) -build-zone-9: $(BUILD_ZONE_SPACE)/build-zone-9/$(SYSIDCFG) - -# zone install options. The template zone uses "install", while the build -# zones "clone" the template zone. -ZI_OPT = clone $(TMPL_ZONE_NAME) -$(BUILD_ZONE_SPACE)/$(TMPL_ZONE_NAME)/$(ZI_TAG): \ - ZI_OPT = install $(TMPL_ZONE_PKGS:%=-e %) - -$(BUILD_ZONE_SPACE): - $(MKDIR) $@ - -# configure a zone -$(ZONECFG_DIR)/%.xml: $(BUILD_ZONE_SPACE) - ( echo "create -b"; \ - echo "set zonepath=$(BUILD_ZONE_SPACE)/$(@:$(ZONECFG_DIR)/%.xml=%)"; \ - echo "set brand=ipkg"; \ - echo "set autoboot=false"; \ - echo "verify"; \ - echo "commit" ) | $(ZONECFG) -z $(@:$(ZONECFG_DIR)/%.xml=%) - -# install a zone -$(BUILD_ZONE_SPACE)/%/$(ZI_TAG): $(ZONECFG_DIR)/%.xml - $(ZONEADM) -z $(@:$(BUILD_ZONE_SPACE)/%/$(ZI_TAG)=%) $(ZI_OPT) - -$(BUILD_ZONE_SPACE)/%/$(SYSIDCFG): $(BUILD_ZONE_SPACE)/%/$(ZI_TAG) - ( echo "system_locale=C"; \ - echo "timezone=$(TZ)"; \ - echo "terminal=xterms"; \ - echo "security_policy=NONE"; \ - echo "timeserver=localhost"; \ - echo "name_service=NONE"; \ - echo "network_interface=none {"; \ - echo " hostname=$(@:$(BUILD_ZONE_SPACE)/%/$(SYSIDCFG)=%)"; \ - echo "}"; \ - echo "nfs4_domain=dynamic"; \ - echo "root_password=NP" ) > $@ diff -r 60344306d223 -r 30b42c38bbc4 make-rules/configure.mk --- a/make-rules/configure.mk Mon Feb 16 13:54:04 2015 -0800 +++ b/make-rules/configure.mk Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. # # @@ -27,7 +27,7 @@ # uses GNU Make to build the components to take advantage of the viewpath # support and build multiple version (32/64 bit) from a shared source. # -# To use these rules, include ../make-rules/configure.mk in your Makefile +# To use these rules, include $(WS_MAKE_RULES)/configure.mk in your Makefile # and define "build", "install", and "test" targets appropriate to building # your component. # Ex: @@ -168,3 +168,12 @@ clean:: $(RM) -r $(BUILD_DIR) $(PROTO_DIR) + +REQUIRED_PACKAGES += developer/build/autoconf +REQUIRED_PACKAGES += developer/build/automake +REQUIRED_PACKAGES += developer/build/gnu-make +REQUIRED_PACKAGES += developer/build/libtool +REQUIRED_PACKAGES += developer/build/pkg-config +REQUIRED_PACKAGES += developer/macro/gnu-m4 +REQUIRED_PACKAGES += file/gnu-coreutils +REQUIRED_PACKAGES += library/libtool/libltdl diff -r 60344306d223 -r 30b42c38bbc4 make-rules/depend.mk --- a/make-rules/depend.mk Mon Feb 16 13:54:04 2015 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -# -# 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) 2010, Oracle and/or its affiliates. All rights reserved. -# - -DEPENDS += $(REQUIRED_TOOL) -DEPENDS += $(REQUIRED_FILE) - -depend:: $(DEPENDS) - -print-required-paths:: - @for path in $(DEPENDS) ; do \ - echo $$path ; \ - done diff -r 60344306d223 -r 30b42c38bbc4 make-rules/environment.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make-rules/environment.mk Sun Feb 15 19:02:09 2015 -0600 @@ -0,0 +1,99 @@ +# +# 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) 2015, Oracle and/or its affiliates. All rights reserved. +# +SUDO = /usr/bin/sudo + +define separator-line + @$(PYTHON) -c 'l="="*(40-len("$1")/2); print("%s%s%s" % (l, "$1", l))' +endef + +component-environment-check:: + $(call separator-line,Workspace) + @echo " Path: $(WS_TOP)" + @echo " Branch: $$(hg identify -b)" + @echo " Changeset: $$(hg identify -n)($$(hg identify -i))" + $(call separator-line,System) + @/usr/bin/uname -a + @echo "Zone: $$(/usr/sbin/zonename)" + @/usr/sbin/psrinfo -vp + @/usr/sbin/ipadm show-addr + $(call separator-line,Required Packages) + @/usr/bin/pkg list -vH $(REQUIRED_PACKAGES:%=/%) + $(call separator-line) + +component-environment-prep:: + @echo "Adding required packages to build environment..." + @-echo $(REQUIRED_PACKAGES:%=/%) | xargs \ + $(SUDO) /usr/bin/pkg install --accept -v + + +# +# For building in a constructed zone. Currently this assumes a template zone +# with /ws (tools mountpoint) and /builds (workspace mountpoint) mounted +# in the same place as in the global zone. It also assumes the current +# $USER account is replicated in the template zone. +# +ZONENAME=bz-$(shell echo "$(WS_TOP)" | md5sum | cut -c0-7)-$(COMPONENT_NAME) + +$(BUILD_DIR)/packages.xml: Makefile $(BUILD_DIR) + @echo "$(REQUIRED_PACKAGES:%=\t\tpkg:/%\n)" >$(@) + +$(BUILD_DIR)/ai_manifest.xml: $(WS_TOOLS)/zone_default.xml $(BUILD_DIR) + $(CP) $< $(@) + +$(BUILD_DIR)/sc_profile.xml: $(WS_TOOLS)/sc_profile.xml $(BUILD_DIR) + $(GSED) -e "s/XXX_USER_XXX/$${USER}/g" -e "s/XXX_UID_XXX/$$(id -u)/g" $< >$(@) + +component-zone-build: $(BUILD_DIR)/ai_manifest.xml $(BUILD_DIR)/packages.xml \ + $(BUILD_DIR)/sc_profile.xml download + $(call separator-line) + $(call separator-line,Create $(ZONENAME)) + $(SUDO) /usr/sbin/zonecfg -z $(ZONENAME) create -t template + #@$(SUDO) /usr/sbin/zoneadm -z $(ZONENAME) clone template + $(SUDO) /usr/sbin/zoneadm -z $(ZONENAME) install \ + -m $(BUILD_DIR)/ai_manifest.xml \ + -c $(BUILD_DIR)/sc_profile.xml + $(call separator-line,Boot $(ZONENAME)) + $(SUDO) /usr/sbin/zoneadm -z $(ZONENAME) boot + @while $$(true) ; do \ + echo "waiting for zone ..." ; \ + $(SUDO) /usr/sbin/zlogin -l $${USER} $(ZONENAME) \ + /bin/true >/dev/null 2>&1 && break ; \ + sleep 10 ; \ + done + #$(call separator-line,Prep $(ZONENAME)) + #@$(SUDO) /usr/sbin/zlogin -S $(ZONENAME) \ + # "cd $(COMPONENT_DIR) ; gmake component-be-prep" + $(call separator-line,Build in $(ZONENAME)) + $(SUDO) /usr/sbin/zlogin -l $${USER} $(ZONENAME) \ + "cd $(COMPONENT_DIR) ; gmake component-be-check install" + # "cd $(COMPONENT_DIR) ; gmake component-be-check publish PKGLINT=/bin/true" + $(call separator-line,Halt $(ZONENAME)) + $(SUDO) /usr/sbin/zoneadm -z $(ZONENAME) halt + $(SUDO) /usr/sbin/zoneadm -z $(ZONENAME) uninstall -F + $(SUDO) /usr/sbin/zonecfg -z $(ZONENAME) delete -F + $(call separator-line) + +component-zone-cleanup:: + -$(SUDO) /usr/sbin/zoneadm -z $(ZONENAME) halt + -$(SUDO) /usr/sbin/zoneadm -z $(ZONENAME) uninstall -F + -$(SUDO) /usr/sbin/zonecfg -z $(ZONENAME) delete -F diff -r 60344306d223 -r 30b42c38bbc4 make-rules/gem.mk --- a/make-rules/gem.mk Mon Feb 16 13:54:04 2015 -0800 +++ b/make-rules/gem.mk Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # GEM=/usr/ruby/$(RUBY_VERSION)/bin/gem @@ -59,3 +59,5 @@ clean:: $(RM) -r $(SOURCE_DIR) $(BUILD_DIR) + +REQUIRED_PACKAGES += runtime/ruby diff -r 60344306d223 -r 30b42c38bbc4 make-rules/install.rb.mk --- a/make-rules/install.rb.mk Mon Feb 16 13:54:04 2015 -0800 +++ b/make-rules/install.rb.mk Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. # VENDOR_RUBY = /usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION) @@ -48,3 +48,5 @@ clean:: $(RM) -r $(SOURCE_DIR) $(BUILD_DIR) + +REQUIRED_PACKAGES += runtime/ruby diff -r 60344306d223 -r 30b42c38bbc4 make-rules/ips.mk --- a/make-rules/ips.mk Mon Feb 16 13:54:04 2015 -0800 +++ b/make-rules/ips.mk Sun Feb 15 19:02:09 2015 -0600 @@ -27,7 +27,7 @@ # Rules and Macros for generating an IPS package manifest and publishing an # IPS package to a pkg depot. # -# To use these rules, include ../make-rules/ips.mk in your Makefile +# To use these rules, include $(WS_MAKE_RULES)/ips.mk in your Makefile # and define an "install" target appropriate to building your component. # Ex: # @@ -56,6 +56,8 @@ # changed, then the -f argument below can be dropped. PKGFMT_CHECK_ARGS = -c -fv2 +WS_TRANSFORMS = $(WS_TOP)/transforms + # Package headers should all pretty much follow the same format METADATA_TEMPLATE = $(WS_TOP)/transforms/manifest-metadata-template COPYRIGHT_TEMPLATE = $(WS_TOP)/transforms/copyright-template @@ -230,7 +232,7 @@ # appropriate conditional dependencies into a python library's # runtime-version-generic package to pull in the version-specific bits when the # corresponding version of python is on the system. -$(BUILD_DIR)/mkgeneric-python: $(WS_TOP)/make-rules/shared-macros.mk +$(BUILD_DIR)/mkgeneric-python: $(WS_MAKE_RULES)/shared-macros.mk $(RM) $@ $(foreach ver,$(shell echo $(PYTHON_VERSIONS) | tr -d .), \ $(call mkgeneric,runtime/python,$(ver))) @@ -264,7 +266,7 @@ # appropriate conditional dependencies into a perl library's # runtime-version-generic package to pull in the version-specific bits when the # corresponding version of perl is on the system. -$(BUILD_DIR)/mkgeneric-perl: $(WS_TOP)/make-rules/shared-macros.mk +$(BUILD_DIR)/mkgeneric-perl: $(WS_MAKE_RULES)/shared-macros.mk $(RM) $@ $(foreach ver,$(shell echo $(PERL_VERSIONS) | tr -d .), \ $(call mkgeneric,runtime/perl,$(ver))) @@ -303,7 +305,7 @@ # appropriate conditional dependencies into a ruby library's # runtime-version-generic package to pull in the version-specific bits when the # corresponding version of ruby is on the system. -$(BUILD_DIR)/mkgeneric-ruby: $(WS_TOP)/make-rules/shared-macros.mk +$(BUILD_DIR)/mkgeneric-ruby: $(WS_MAKE_RULES)/shared-macros.mk $(RM) $@ $(foreach ver,$(RUBY_VERSIONS),\ $(call mkgeneric,runtime/ruby,$(shell echo $(ver) | \ @@ -347,42 +349,39 @@ $(ENV) $(COMPONENT_PUBLISH_ENV) $(PKGDEPEND) generate \ $(PKGDEPEND_GENERATE_OPTIONS) $< >$@ -# These files should contain a list of packages that the component is known to -# depend on. Using resolve.deps is not required, but significantly speeds up -# the "pkg resolve" step. -EXTDEPFILES ?= $(wildcard $(sort $(addsuffix ../resolve.deps, $(dir $(DEPENDED))))) - -# If the package contains no automatically discoverable dependencies, then -# we can speed up resolution by providing a dummy resolve.deps to skip loading -# all the possible packages for resolution. Unfortunately, pkgdepend does not -# accept a completely empty resolve.deps, so we pass the userland-incorporation -# as a quick, content-free placeholder. -NULLDEPFILE = $(BUILD_DIR)/null-resolve.deps +# pkgdepend resolve builds a map of all installed packages by default. This +# makes dependency resolution particularly slow. We can dramatically improve +# performance here by creating a file with a list of packages that we know +# are needed, dramatically reducing the overhead involved in creating and +# searching this map. +# +# Generate a resolve.deps file from the dependencies in the Makefile and +# fragments that it uses. +RESOLVE_DEPS=$(BUILD_DIR)/resolve.deps -# This is a target that should only be run by hand, and not something that -# .resolved-$(MACH) should depend on. -sample-resolve.deps: - echo " print %(fmri)>" > rd-trans - for i in build/*.depend; do \ - $(PKGMOGRIFY) -O /dev/null $$i rd-trans | tr " " "\n" | sort -u > m1; \ - $(PKGMOGRIFY) -O /dev/null $$i.res rd-trans | tr " " "\n" | sort -u > m2; \ - comm -13 m1 m2; \ - done | sed -e 's/@[^ ]*//g' -e 's,pkg:/,,g' | sort -u > resolve.deps - $(RM) rd-trans m1 m2 - if [[ ! -s resolve.deps ]]; then \ - echo "No computed dependencies found; removing empty resolve.deps."; \ - $(RM) resolve.deps; \ - fi - +$(RESOLVE_DEPS): $(MAKEFILE_PREREQ) $(BUILD_DIR) + @for pkg in $(REQUIRED_PACKAGES:%=/%) ; do \ + echo $${pkg} ; \ + done | sort -u >$@ # resolve the dependencies all at once -$(BUILD_DIR)/.resolved-$(MACH): $(DEPENDED) - if [[ "$(EXTDEPFILES)" == "$(NULLDEPFILE)" ]] ; then \ - echo 'consolidation/userland/userland-incorporation' > $(NULLDEPFILE) ; \ - fi - $(PKGDEPEND) resolve $(EXTDEPFILES:%=-e %) -m $(DEPENDED) +$(BUILD_DIR)/.resolved-$(MACH): $(DEPENDED) $(RESOLVE_DEPS) + $(PKGDEPEND) resolve $(RESOLVE_DEPS:%=-e %) -m $(DEPENDED) $(TOUCH) $@ +# +# Generate a set of REQUIRED_PACKAGES based on what is needed to for pkgdepend +# to resolve properly. Automatically append this to your Makefile for the truly +# lazy among us. This is only a piece of the REQUIRED_PACKAGES puzzle. +# You must still include packages for tools you build and test with. +# +REQUIRED_PACKAGES:: $(RESOLVED) + $(GMAKE) RESOLVE_DEPS= $(BUILD_DIR)/.resolved-$(MACH) + @echo "# Auto-generated contents below. Please manually verify and remove this comment" >>Makefile + @$(PKGMOGRIFY) $(WS_TRANSFORMS)/$@ $(RESOLVED) | \ + $(GSED) -e '/^[\t ]*$$/d' -e '/^#/d' | sort -u >>Makefile + @echo "*** Please edit your Makefile and verify the new content at the end ***" + # lint the manifests all at once $(BUILD_DIR)/.linted-$(MACH): $(BUILD_DIR)/.resolved-$(MACH) @echo "VALIDATING MANIFEST CONTENT: $(RESOLVED)" @@ -440,7 +439,7 @@ $(RESOLVED): install -canonical-manifests: $(CANONICAL_MANIFESTS) Makefile $(PATCHES) +canonical-manifests: $(CANONICAL_MANIFESTS) $(MAKEFILE_PREREQ) $(PATCHES) ifeq ($(strip $(CANONICAL_MANIFESTS)),) # If there were no canonical manifests in the workspace, nothing will # be published and we should fail. A sample manifest can be generated @@ -453,7 +452,7 @@ # This converts required paths to containing package names for be able to # properly setup the build environment for a component. -required-pkgs.mk: Makefile +required-pkgs.mk: $(MAKEFILE_PREREQ) @echo "generating $@ from Makefile REQUIRED_* data" @pkg search -H -l '<$(DEPENDS:%=% OR) /bin/true>' \ | sed -e 's/pkg:\/\(.*\)@.*/REQUIRED_PKGS += \1/g' >$@ diff -r 60344306d223 -r 30b42c38bbc4 make-rules/justmake.mk --- a/make-rules/justmake.mk Mon Feb 16 13:54:04 2015 -0800 +++ b/make-rules/justmake.mk Sun Feb 15 19:02:09 2015 -0600 @@ -18,13 +18,13 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # # # Rules and Macros for building opens source software that just uses their # own make and no autoconf-style tools. # -# To use these rules, include ../make-rules/justmake.mk in your Makefile +# To use these rules, include $(WS_MAKE_RULES)/justmake.mk in your Makefile # and define "build", "install" targets appropriate to building your component. # Ex: # diff -r 60344306d223 -r 30b42c38bbc4 make-rules/lint-libraries.mk --- a/make-rules/lint-libraries.mk Mon Feb 16 13:54:04 2015 -0800 +++ b/make-rules/lint-libraries.mk Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # # @@ -26,12 +26,12 @@ # libraries in the component directory and adds targets to build and install # them for 32/64 bit. # -# To use these rules, include $(WS_TOP)/make-rules/lint-libraries.mk in your +# To use these rules, include $(WS_MAKE_RULES)/lint-libraries.mk in your # Makefile and add your lint library source in your component directory as # llib-l{lib}. # # Makefile -# include $(WS_TOP)/make-rules/lint-libraries.mk +# include $(WS_MAKE_RULES)/lint-libraries.mk # # llib-l{libname} # diff -r 60344306d223 -r 30b42c38bbc4 make-rules/makemaker.mk --- a/make-rules/makemaker.mk Mon Feb 16 13:54:04 2015 -0800 +++ b/make-rules/makemaker.mk Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # # Perl 5.12 and older are 32-bit only. @@ -153,3 +153,13 @@ clean:: $(RM) -r $(BUILD_DIR) $(PROTO_DIR) + +ifneq ($(findstring 5.12, $(PERL_VERSIONS)),) +REQUIRED_PACKAGES += runtime/perl-512 +endif +ifneq ($(findstring 5.12-mt, $(PERL_VERSIONS)),) +REQUIRED_PACKAGES += runtime/perl-threaded-512 +endif +ifneq ($(findstring 5.16, $(PERL_VERSIONS)),) +REQUIRED_PACKAGES += runtime/perl-516 +endif diff -r 60344306d223 -r 30b42c38bbc4 make-rules/prep.mk --- a/make-rules/prep.mk Mon Feb 16 13:54:04 2015 -0800 +++ b/make-rules/prep.mk Sun Feb 15 19:02:09 2015 -0600 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. # # One must do all unpack and patch in sequence. @@ -64,7 +64,7 @@ define download-rule ARCHIVES += $$(COMPONENT_ARCHIVE$(1)) CLOBBER_PATHS += $$(COMPONENT_ARCHIVE$(1)) -$$(USERLAND_ARCHIVES)$$(COMPONENT_ARCHIVE$(1)): Makefile +$$(USERLAND_ARCHIVES)$$(COMPONENT_ARCHIVE$(1)): $(MAKEFILE_PREREQ) $$(FETCH) --file $$@ \ $$(COMPONENT_ARCHIVE_URL$(1):%=--url %) \ $$(COMPONENT_ARCHIVE_HASH$(1):%=--hash %) \ @@ -97,7 +97,7 @@ # Template for unpacking rules. define unpack-rule -$$(SOURCE_DIR)/.unpacked$(1): download Makefile $$(PATCHDIR_PATCHES$(1)) +$$(SOURCE_DIR)/.unpacked$(1): download $(MAKEFILE_PREREQ) $$(PATCHDIR_PATCHES$(1)) $$(RM) -r $$(COMPONENT_SRC$(1)) $$(UNPACK) $$(UNPACK_ARGS$(1)) \ $$(USERLAND_ARCHIVES)$$(COMPONENT_ARCHIVE$(1)) @@ -142,3 +142,13 @@ clobber:: clean $(RM) -r $(CLOBBER_PATHS) + +REQUIRED_PACKAGES += archiver/gnu-tar +REQUIRED_PACKAGES += compress/bzip2 +REQUIRED_PACKAGES += compress/gzip +REQUIRED_PACKAGES += compress/p7zip +REQUIRED_PACKAGES += compress/unzip +REQUIRED_PACKAGES += compress/xz +REQUIRED_PACKAGES += developer/java/jdk +REQUIRED_PACKAGES += runtime/ruby +REQUIRED_PACKAGES += text/gnu-patch diff -r 60344306d223 -r 30b42c38bbc4 make-rules/setup.py.mk --- a/make-rules/setup.py.mk Mon Feb 16 13:54:04 2015 -0800 +++ b/make-rules/setup.py.mk Sun Feb 15 19:02:09 2015 -0600 @@ -18,9 +18,12 @@ # # CDDL HEADER END # -# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. # +# $ (foreach suffix,$(VERSIONS),$(eval include $(WS_MAKE_RULES)/python-$(suffix).mk)) + + $(BUILD_DIR)/%-2.6/.built: PYTHON_VERSION=2.6 $(BUILD_DIR)/%-2.7/.built: PYTHON_VERSION=2.7 $(BUILD_DIR)/%-3.4/.built: PYTHON_VERSION=3.4 @@ -180,3 +183,14 @@ # Make it easy to construct a URL for a pypi source download. PYPI_BASE = http://pypi.python.org/packages/source pypi_url = $(PYPI_BASE)/$(shell echo $(COMPONENT_NAME) | cut -c1)/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE) + +ifneq ($(findstring 2.6, $(PYTHON_VERSIONS)),) +REQUIRED_PACKAGES += runtime/python-26 +endif +ifneq ($(findstring 2.7, $(PYTHON_VERSIONS)),) +REQUIRED_PACKAGES += runtime/python-27 +endif +ifneq ($(findstring 3.4, $(PYTHON_VERSIONS)),) +REQUIRED_PACKAGES += runtime/python-34 +endif +REQUIRED_PACKAGES += library/python/setuptools diff -r 60344306d223 -r 30b42c38bbc4 make-rules/shared-macros.mk --- a/make-rules/shared-macros.mk Mon Feb 16 13:54:04 2015 -0800 +++ b/make-rules/shared-macros.mk Sun Feb 15 19:02:09 2015 -0600 @@ -47,13 +47,14 @@ export WS_TOP := $(shell hg root) endif -WS_LOGS = $(WS_TOP)/$(MACH)/logs -WS_REPO = $(WS_TOP)/$(MACH)/repo +WS_MACH = $(WS_TOP)/$(MACH) +WS_LOGS = $(WS_MACH)/logs +WS_REPO = $(WS_MACH)/repo WS_TOOLS = $(WS_TOP)/tools WS_MAKE_RULES = $(WS_TOP)/make-rules WS_COMPONENTS = $(WS_TOP)/components WS_INCORPORATIONS = $(WS_TOP)/incorporations -WS_LINT_CACHE = $(WS_TOP)/$(MACH)/pkglint-cache +WS_LINT_CACHE = $(WS_MACH)/pkglint-cache # we want our pkg piplines to fail if there is an error # (like if pkgdepend fails in the middle of a pipe), but @@ -67,6 +68,9 @@ install: SHELLOPTS= publish: SHELLOPTS=pipefail +# This can be overridden to avoid rebuilding when you touch a Makefile +MAKEFILE_PREREQ = Makefile + # some things don't build properly in non-C locales, # so lets stay there export LC_ALL=C @@ -87,7 +91,7 @@ include $(WS_MAKE_RULES)/ips-buildinfo.mk -COMPILER = studio +COMPILER ?= studio BITS = 32 # If we are building multiple versions of python, make sure that python 2.6 @@ -529,6 +533,7 @@ SYMLINK = /bin/ln -s ENV = /usr/bin/env INSTALL = /usr/bin/ginstall +GNU_GREP = /usr/gnu/bin/grep CHMOD = /usr/bin/chmod NAWK = /usr/bin/nawk TEE = /usr/bin/tee @@ -870,3 +875,35 @@ component-hook: @$(COMPONENT_HOOK) +# +# Packages with tools that are required to build Userland components +# +REQUIRED_PACKAGES += developer/build/gnu-make +REQUIRED_PACKAGES += developer/build/make +ifeq ($(COMPILER),gcc3) +REQUIRED_PACKAGES += developer/gcc-3 +endif +ifeq ($(COMPILER),gcc) +REQUIRED_PACKAGES += developer/gcc-47 +endif +ifeq ($(COMPILER),studio) +# uncomment this line if you need to install Studio +#REQUIRED_PACKAGES += developer/solarisstudio-123 +endif +ifeq ($(PARFAIT_BUILD),yes) +# uncomment this line if you need to install Parfait +#REQUIRED_PACKAGES += developer/parfait/parfait-tools-151 +endif +REQUIRED_PACKAGES += developer/versioning/mercurial +REQUIRED_PACKAGES += file/gnu-findutils +REQUIRED_PACKAGES += package/pkg +REQUIRED_PACKAGES += runtime/python-27 +REQUIRED_PACKAGES += shell/bash +REQUIRED_PACKAGES += shell/ksh93 +REQUIRED_PACKAGES += text/gawk +REQUIRED_PACKAGES += text/gnu-grep +REQUIRED_PACKAGES += text/gnu-sed +REQUIRED_PACKAGES += developer/java/jdk-7 +REQUIRED_PACKAGES += security/sudo + +include $(WS_MAKE_RULES)/environment.mk diff -r 60344306d223 -r 30b42c38bbc4 tools/sc_profile.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/sc_profile.xml Sun Feb 15 19:02:09 2015 -0600 @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 60344306d223 -r 30b42c38bbc4 tools/zone_default.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/zone_default.xml Sun Feb 15 19:02:09 2015 -0600 @@ -0,0 +1,77 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + facet.locale.* + facet.locale.de + facet.locale.de_DE + facet.locale.en + facet.locale.en_US + facet.locale.es + facet.locale.es_ES + facet.locale.fr + facet.locale.fr_FR + facet.locale.it + facet.locale.it_IT + facet.locale.ja + facet.locale.ja_* + facet.locale.ko + facet.locale.ko_* + facet.locale.pt + facet.locale.pt_BR + facet.locale.zh + facet.locale.zh_CN + facet.locale.zh_TW + + + + pkg:/group/system/solaris-small-server + &REQUIRED_PACKAGES; + + + + diff -r 60344306d223 -r 30b42c38bbc4 transforms/REQUIRED_PACKAGES --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/transforms/REQUIRED_PACKAGES Sun Feb 15 19:02:09 2015 -0600 @@ -0,0 +1,4 @@ +# print a line "REQUIRED_PACKAGES += {pkg-short-name}" + print REQUIRED_PACKAGES += %<1> > +# drop all actions + drop >