diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 502eeea6aa..75e2df001f 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -159,15 +159,6 @@ $(2)_INSTALL_OPTS ?= install $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install -# This must be repeated from inner-generic-package, otherwise we get an empty -# _DEPENDENCIES if _AUTORECONF is YES. Also filter the result of _AUTORECONF -# and _GETTEXTIZE away from the non-host rule -ifeq ($(4),host) -$(2)_DEPENDENCIES ?= $$(filter-out host-automake host-autoconf host-libtool \ - host-gettext host-skeleton host-toolchain $(1),\ - $$(patsubst host-host-%,host-%,$$(addprefix host-,$$($(3)_DEPENDENCIES)))) -endif - # # Configure step. Only define it if not already defined by the package # .mk file. And take care of the differences between host and target diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index bca360332b..6f0ecf9f72 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -142,13 +142,6 @@ endef endif endif -# This must be repeated from inner-generic-package, otherwise we only get -# host-cmake in _DEPENDENCIES because of the following line -ifeq ($(4),host) -$(2)_DEPENDENCIES ?= $$(filter-out host-skeleton host-toolchain $(1),\ - $$(patsubst host-host-%,host-%,$$(addprefix host-,$$($(3)_DEPENDENCIES)))) -endif - $(2)_DEPENDENCIES += host-cmake # diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index fa404cae24..94187f9814 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -511,10 +511,6 @@ $(2)_REDIST_SOURCES_DIR = $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))/$$($(2) # dependency $(2)_ADD_TOOLCHAIN_DEPENDENCY ?= YES -ifeq ($(4),host) -$(2)_DEPENDENCIES ?= $$(filter-out host-skeleton host-toolchain $(1),\ - $$(patsubst host-host-%,host-%,$$(addprefix host-,$$($(3)_DEPENDENCIES)))) -endif ifeq ($(4),target) ifneq ($(1),skeleton) $(2)_DEPENDENCIES += skeleton diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 9725d24f98..38bc45ffa3 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -138,21 +138,6 @@ else $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'") endif -# The below statement intends to calculate the dependencies of host -# packages by derivating them from the dependencies of the -# corresponding target package, after adding the 'host-' prefix in -# front of the dependencies. -# -# However it must be repeated from inner-generic-package, as we need -# to exclude the python, host-python and host-python-setuptools -# packages, which are added below in the list of dependencies -# depending on the package characteristics, and shouldn't be derived -# automatically from the dependencies of the corresponding target -# package. -ifeq ($(4),host) -$(2)_DEPENDENCIES ?= $$(filter-out host-python host-python3 host-python-setuptools host-skeleton host-toolchain $(1),$$(patsubst host-host-%,host-%,$$(addprefix host-,$$($(3)_DEPENDENCIES)))) -endif - # Target packages need both the python interpreter on the target (for # runtime) and the python interpreter on the host (for # compilation). However, host packages only need the python diff --git a/package/pkg-rebar.mk b/package/pkg-rebar.mk index 44c6d6c8d2..7605a64ade 100644 --- a/package/pkg-rebar.mk +++ b/package/pkg-rebar.mk @@ -188,20 +188,6 @@ endif else # !target -ifeq ($$($(2)_USE_AUTOCONF),YES) -# This must be repeated from inner-autotools-package, otherwise we get -# an empty _DEPENDENCIES if _AUTORECONF is YES or _USE_BUNDLED_REBAR -# is NO. Also filter the result of _AUTORECONF and _GETTEXTIZE away -# from the non-host rule -$(2)_DEPENDENCIES ?= $$(filter-out host-automake host-autoconf host-libtool \ - host-gettext host-skeleton host-toolchain host-erlang-rebar $(1),\ - $$(patsubst host-host-%,host-%,$$(addprefix host-,$$($(3)_DEPENDENCIES)))) -else -# Same deal, if _USE_BUNDLED_REBAR is NO. -$(2)_DEPENDENCIES ?= $$(filter-out host-skeleton host-toolchain host-erlang-rebar $(1),\ - $$(patsubst host-host-%,host-%,$$(addprefix host-,$$($(3)_DEPENDENCIES)))) -endif - # Host packages need the erlang interpreter on the host $(2)_DEPENDENCIES += host-erlang diff --git a/package/pkg-virtual.mk b/package/pkg-virtual.mk index 244c1d0420..3fbe0a31da 100644 --- a/package/pkg-virtual.mk +++ b/package/pkg-virtual.mk @@ -49,13 +49,6 @@ $(2)_SOURCE = # Fake a version string, so it looks nicer in the build log $(2)_VERSION = virtual -# This must be repeated from inner-generic-package, otherwise we get an empty -# _DEPENDENCIES -ifeq ($(4),host) -$(2)_DEPENDENCIES ?= $$(filter-out host-skeleton host-toolchain $(1),\ - $$(patsubst host-host-%,host-%,$$(addprefix host-,$$($(3)_DEPENDENCIES)))) -endif - # Add dependency against the provider $(2)_DEPENDENCIES += $$(call qstrip,$$(BR2_PACKAGE_PROVIDES_$(2)))