userland: introduce USERLAND_REQUIRED_PACKAGES

Aurelien Larcher

2020-06-06 1349f8cc5554e0ddcbfee823f5f88402ec015364

userland: introduce USERLAND_REQUIRED_PACKAGES

 make-rules/environment.mk

@@ -40,11 +40,11 @@
    @/usr/sbin/psrinfo -vp
    @/usr/sbin/ipadm show-addr
    $(call separator-line,Required Packages)
    @/usr/bin/pkg list -vH $(REQUIRED_PACKAGES:%=/%)
    @/usr/bin/pkg list -vH $(USERLAND_REQUIRED_PACKAGES:%=/%) $(REQUIRED_PACKAGES:%=/%)
    $(call separator-line)

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


 make-rules/gem.mk

@@ -104,4 +104,4 @@
clean::
    $(RM) -r $(SOURCE_DIR) $(BUILD_DIR)

REQUIRED_PACKAGES += runtime/ruby
USERLAND_REQUIRED_PACKAGES += runtime/ruby

 make-rules/prep-download.mk

@@ -42,7 +42,7 @@
# files, but not to remove mismatches; good to save traffic when initially
# fetching a new archive just to learn what checksum to expect in Makefile.
#FETCH_KEEP ?= --keep
FETCH_KEEP ?= 
FETCH_KEEP ?=

# Template for download rules.
define download-rules
@@ -64,7 +64,7 @@
        $$(if $$(COMPONENT_FETCH_USER_AGENT$(1)),--user-agent $$(COMPONENT_FETCH_USER_AGENT$(1)))
    $$(TOUCH) $$@

REQUIRED_PACKAGES += runtime/python-27
USERLAND_REQUIRED_PACKAGES += runtime/python-27

endif
endef
@@ -77,4 +77,4 @@
$(foreach suffix, $(URL_SUFFIXES), $(eval $(call download-rules,_$(suffix))))

# Needed for signature validation of downloads
REQUIRED_PACKAGES += crypto/gnupg
USERLAND_REQUIRED_PACKAGES += crypto/gnupg

 make-rules/prep-hg.mk

@@ -81,7 +81,7 @@
        -e "s/\(HG_HASH$(1)[[:space:]]*=[[:space:]]*\).*/\1sha256:$$$${HG_HASH}/" \
        Makefile)

REQUIRED_PACKAGES += developer/versioning/mercurial
USERLAND_REQUIRED_PACKAGES += developer/versioning/mercurial

endif
endif

 make-rules/prep-patch.mk

@@ -94,7 +94,7 @@

patch::    $$(SOURCE_DIR$(1))/.patched

REQUIRED_PACKAGES += text/gnu-patch
USERLAND_REQUIRED_PACKAGES += text/gnu-patch

endif
endef

 make-rules/prep-svn.mk

@@ -67,7 +67,7 @@
        -e "s/^SVN_HASH$(1)=.*/SVN_HASH$(1)=  sha256:$$$${SVN_HASH}/" \
        Makefile)

REQUIRED_PACKAGES += developer/versioning/subversion
USERLAND_REQUIRED_PACKAGES += developer/versioning/subversion

endif
endif

 make-rules/prep-unpack.mk

@@ -52,17 +52,17 @@

unpack::    $$(UNPACK_STAMP$(1))

REQUIRED_PACKAGES += archiver/gnu-tar
REQUIRED_PACKAGES += compress/bzip2
REQUIRED_PACKAGES += compress/gzip
REQUIRED_PACKAGES += compress/p7zip
REQUIRED_PACKAGES += compress/unzip
REQUIRED_PACKAGES += compress/lzip
REQUIRED_PACKAGES += compress/xz
REQUIRED_PACKAGES += compress/zip
REQUIRED_PACKAGES += compress/zstd
REQUIRED_PACKAGES += developer/java/jdk
REQUIRED_PACKAGES += runtime/ruby
USERLAND_REQUIRED_PACKAGES += archiver/gnu-tar
USERLAND_REQUIRED_PACKAGES += compress/bzip2
USERLAND_REQUIRED_PACKAGES += compress/gzip
USERLAND_REQUIRED_PACKAGES += compress/p7zip
USERLAND_REQUIRED_PACKAGES += compress/unzip
USERLAND_REQUIRED_PACKAGES += compress/lzip
USERLAND_REQUIRED_PACKAGES += compress/xz
USERLAND_REQUIRED_PACKAGES += compress/zip
USERLAND_REQUIRED_PACKAGES += compress/zstd
USERLAND_REQUIRED_PACKAGES += developer/java/jdk
USERLAND_REQUIRED_PACKAGES += runtime/ruby

endif
endif

 make-rules/shared-macros.mk

@@ -1339,7 +1339,7 @@
#
# Packages with tools that are required to build Userland components
#
REQUIRED_PACKAGES += metapackages/build-essential
USERLAND_REQUIRED_PACKAGES += metapackages/build-essential

# Only a default dependency if component being built produces binaries.
ifneq ($(strip $(BUILD_BITS)),NO_ARCH)
@@ -1357,6 +1357,7 @@
REQUIRED_PACKAGES_SUBST+= GOBJC_RUNTIME_PKG

include $(WS_MAKE_RULES)/environment.mk
include $(WS_MAKE_RULES)/depend.mk

# A simple rule to print the value of any macro.  Ex:
#    $ gmake print-REQUIRED_PACKAGES