diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index daa688dab6..717ff81593 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -160,10 +160,6 @@ ifeq ($(4),host) $(2)_AUTORECONF_OPTS ?= $$($(3)_AUTORECONF_OPTS) endif -$(2)_CONF_ENV ?= -$(2)_CONF_OPTS ?= -$(2)_MAKE_ENV ?= -$(2)_MAKE_OPTS ?= $(2)_INSTALL_OPTS ?= install $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 4ee100a0c6..3b1db35fb6 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -51,11 +51,7 @@ endif define inner-cmake-package -$(2)_CONF_ENV ?= -$(2)_CONF_OPTS ?= $(2)_MAKE ?= $$(MAKE) -$(2)_MAKE_ENV ?= -$(2)_MAKE_OPTS ?= $(2)_INSTALL_OPTS ?= install $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index c8351b3027..5626af1d87 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -540,8 +540,6 @@ $(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASENAME) ifndef $(2)_SUBDIR ifdef $(3)_SUBDIR $(2)_SUBDIR = $$($(3)_SUBDIR) - else - $(2)_SUBDIR ?= endif endif @@ -838,31 +836,6 @@ $(2)_EXTRACT_CMDS ?= \ $$(TAR_OPTIONS) -) # pre/post-steps hooks -$(2)_PRE_DOWNLOAD_HOOKS ?= -$(2)_POST_DOWNLOAD_HOOKS ?= -$(2)_PRE_EXTRACT_HOOKS ?= -$(2)_POST_EXTRACT_HOOKS ?= -$(2)_PRE_RSYNC_HOOKS ?= -$(2)_POST_RSYNC_HOOKS ?= -$(2)_PRE_PATCH_HOOKS ?= -$(2)_POST_PATCH_HOOKS ?= -$(2)_PRE_CONFIGURE_HOOKS ?= -$(2)_POST_CONFIGURE_HOOKS ?= -$(2)_PRE_BUILD_HOOKS ?= -$(2)_POST_BUILD_HOOKS ?= -$(2)_PRE_INSTALL_HOOKS ?= -$(2)_POST_INSTALL_HOOKS ?= -$(2)_PRE_INSTALL_STAGING_HOOKS ?= -$(2)_POST_INSTALL_STAGING_HOOKS ?= -$(2)_PRE_INSTALL_TARGET_HOOKS ?= -$(2)_POST_INSTALL_TARGET_HOOKS ?= -$(2)_PRE_INSTALL_IMAGES_HOOKS ?= -$(2)_POST_INSTALL_IMAGES_HOOKS ?= -$(2)_PRE_LEGAL_INFO_HOOKS ?= -$(2)_POST_LEGAL_INFO_HOOKS ?= -$(2)_TARGET_FINALIZE_HOOKS ?= -$(2)_ROOTFS_PRE_CMD_HOOKS ?= - $(2)_POST_PREPARE_HOOKS += FIXUP_PYTHON_SYSCONFIGDATA ifeq ($$($(2)_TYPE),target) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index 23a291fccf..32dcfea0bc 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -81,9 +81,6 @@ define inner-kconfig-package # Default values $(2)_MAKE ?= $$(MAKE) $(2)_KCONFIG_EDITORS ?= menuconfig -$(2)_KCONFIG_OPTS ?= -$(2)_KCONFIG_FIXUP_CMDS ?= -$(2)_KCONFIG_FRAGMENT_FILES ?= $(2)_KCONFIG_DOTCONFIG ?= .config $(2)_KCONFIG_SUPPORTS_DEFCONFIG ?= YES diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 16a90d157b..ec535174b6 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -45,10 +45,6 @@ NINJA_OPTS = $(if $(VERBOSE),-v) -j$(PARALLEL_JOBS) define inner-meson-package -$(2)_CONF_ENV ?= -$(2)_CONF_OPTS ?= -$(2)_NINJA_ENV ?= - # # 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-python.mk b/package/pkg-python.mk index e6b81bdfd3..ce0fc97283 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -108,10 +108,6 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ define inner-python-package -$(2)_ENV ?= -$(2)_BUILD_OPTS ?= -$(2)_INSTALL_OPTS ?= - ifndef $(2)_SETUP_TYPE ifdef $(3)_SETUP_TYPE $(2)_SETUP_TYPE = $$($(3)_SETUP_TYPE) diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index deb033c1d6..4dcaf6dd62 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -40,10 +40,6 @@ endef define inner-qmake-package -$(2)_CONF_ENV ?= -$(2)_CONF_OPTS ?= -$(2)_MAKE_ENV ?= -$(2)_MAKE_OPTS ?= $(2)_INSTALL_STAGING_OPTS ?= install $(2)_INSTALL_TARGET_OPTS ?= $$($(2)_INSTALL_STAGING_OPTS) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index 038d89454e..a593476a69 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -49,11 +49,6 @@ else $(2)_WAF ?= ./waf endif -$(2)_BUILD_OPTS ?= -$(2)_INSTALL_STAGING_OPTS ?= -$(2)_INSTALL_TARGET_OPTS ?= -$(2)_WAF_OPTS ?= - # # Configure step. Only define it if not already defined by the package # .mk file.