Install REQUIRED_PACKAGES if not installed while preparing for component build

Alexander Pyhalov

2019-07-25 5cb52ef221db8a423b0ef899f02f181377ceb546

Install REQUIRED_PACKAGES if not installed while preparing for component build

 make-rules/environment.mk

@@ -44,9 +44,9 @@
    $(call separator-line)

component-environment-prep::
    @echo "Adding required packages to build environment..."
    @-echo $(REQUIRED_PACKAGES:%=/%) | xargs \
               $(PFEXEC) /usr/bin/pkg install --accept -v
    @/usr/bin/pkg list -vH $(REQUIRED_PACKAGES:%=/%) >/dev/null || \
        { echo "Adding required packages to build environment..."; \
          $(PFEXEC) /usr/bin/pkg install --accept  $(REQUIRED_PACKAGES:%=/%) || [ $$? -eq 4 ] ; }

# Short aliases for user convenience
env-check:: component-environment-check

 make-rules/prep.mk

@@ -37,7 +37,7 @@

patch::        unpack

$(SOURCE_DIR)/.prep:    download unpack patch
$(SOURCE_DIR)/.prep:    component-environment-prep download unpack patch
    $(COMPONENT_PREP_ACTION)
    $(TOUCH) $@