From 307f262a91f69db5d69f67e8e569576cc2cc90bf Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 9 Jul 2022 12:22:57 +0200 Subject: [PATCH] - remove auto-assigned HOST_ variables --- package/dosfstools/dosfstools.mk | 5 ----- package/e2fsprogs/e2fsprogs.mk | 5 ----- package/expat/expat.mk | 5 ----- package/libffi/libffi.mk | 5 ----- package/libpng/libpng.mk | 5 ----- package/libtirpc/libtirpc.mk | 5 ----- package/lua/lua.mk | 5 ----- package/luarocks/luarocks.mk | 5 ----- package/meson/meson.mk | 5 ----- package/mtd-utils/mtd-utils.mk | 5 ----- package/mtools/mtools.mk | 5 ----- package/ninja/ninja.mk | 5 ----- package/parted/parted.mk | 5 ----- package/pkgconf/pkgconf.mk | 5 ----- package/python-setuptools/python-setuptools.mk | 5 ----- package/python3/python3.mk | 5 ----- package/qrencode/qrencode.mk | 5 ----- package/u-boot/u-boot.mk | 5 ----- package/waf/waf.mk | 5 ----- package/zic/zic.mk | 5 ----- package/zlib/zlib.mk | 5 ----- 21 files changed, 105 deletions(-) diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk index 4366e24f..6cbd7ba2 100644 --- a/package/dosfstools/dosfstools.mk +++ b/package/dosfstools/dosfstools.mk @@ -26,11 +26,6 @@ dosfstools: | $(TARGET_DIR) # ----------------------------------------------------------------------------- -HOST_DOSFSTOOLS_VERSION = $(DOSFSTOOLS_VERSION) -HOST_DOSFSTOOLS_DIR = $(DOSFSTOOLS_DIR) -HOST_DOSFSTOOLS_SOURCE = $(DOSFSTOOLS_SOURCE) -HOST_DOSFSTOOLS_SITE = $(DOSFSTOOLS_SITE) - HOST_DOSFSTOOLS_AUTORECONF = YES HOST_DOSFSTOOLS_CONF_OPTS = \ diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index c9a0f6de..e0705c6c 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -68,11 +68,6 @@ e2fsprogs: | $(TARGET_DIR) # ----------------------------------------------------------------------------- -HOST_E2FSPROGS_VERSION = $(E2FSPROGS_VERSION) -HOST_E2FSPROGS_DIR = $(E2FSPROGS_DIR) -HOST_E2FSPROGS_SOURCE = $(E2FSPROGS_SOURCE) -HOST_E2FSPROGS_SITE = $(E2FSPROGS_SITE) - HOST_E2FSPROGS_CONF_OPTS = \ --enable-symlink-install \ --with-crond-dir=no diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 9d3bc174..5a3f9335 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -26,11 +26,6 @@ expat: | $(TARGET_DIR) # ----------------------------------------------------------------------------- -HOST_EXPAT_VERSION = $(EXPAT_VERSION) -HOST_EXPAT_DIR = $(EXPAT_DIR) -HOST_EXPAT_SOURCE = $(EXPAT_SOURCE) -HOST_EXPAT_SITE = $(EXPAT_SITE) - HOST_EXPAT_CONF_OPTS = \ --without-docbook diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk index 1df5d713..79b751e9 100644 --- a/package/libffi/libffi.mk +++ b/package/libffi/libffi.mk @@ -20,10 +20,5 @@ libffi: | $(TARGET_DIR) # ----------------------------------------------------------------------------- -HOST_LIBFFI_VERSION = $(LIBFFI_VERSION) -HOST_LIBFFI_DIR = $(LIBFFI_DIR) -HOST_LIBFFI_SOURCE = $(LIBFFI_SOURCE) -HOST_LIBFFI_SITE = $(LIBFFI_SITE) - host-libffi: | $(HOST_DIR) $(call host-autotools-package) diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index 1ade8a49..1095039f 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -27,11 +27,6 @@ libpng: | $(TARGET_DIR) # ----------------------------------------------------------------------------- -HOST_LIBPNG_VERSION = $(LIBPNG_VERSION) -HOST_LIBPNG_DIR = $(LIBPNG_DIR) -HOST_LIBPNG_SOURCE = $(LIBPNG_SOURCE) -HOST_LIBPNG_SITE = $(LIBPNG_SITE) - HOST_LIBPNG_DEPENDENCIES = host-zlib host-libpng: | $(HOST_DIR) diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk index 9abe4533..5f03924a 100644 --- a/package/libtirpc/libtirpc.mk +++ b/package/libtirpc/libtirpc.mk @@ -24,11 +24,6 @@ libtirpc: | $(TARGET_DIR) # ----------------------------------------------------------------------------- -HOST_LIBTIRPC_VERSION = $(LIBTIRPC_VERSION) -HOST_LIBTIRPC_DIR = $(LIBTIRPC_DIR) -HOST_LIBTIRPC_SOURCE = $(LIBTIRPC_SOURCE) -HOST_LIBTIRPC_SITE = $(LIBTIRPC_SITE) - HOST_LIBTIRPC_CONF_OPTS = \ --disable-gssapi diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 994cee8c..08ad748d 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -41,11 +41,6 @@ lua: | $(TARGET_DIR) # ----------------------------------------------------------------------------- -HOST_LUA_VERSION = $(LUA_VERSION) -HOST_LUA_DIR = lua-$(HOST_LUA_VERSION) -HOST_LUA_SOURCE = lua-$(HOST_LUA_VERSION).tar.gz -HOST_LUA_SITE = http://www.lua.org/ftp - HOST_LUA_PATCH = 0001-fix-LUA_ROOT.patch HOST_LUA_PATCH += 0002-remove-readline.patch diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index ba5d5f44..119cbfe6 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -11,11 +11,6 @@ LUAROCKS_SITE = https://luarocks.github.io/luarocks/releases # ------------------------------------------------------------------------------ -HOST_LUAROCKS_VERSION = $(LUAROCKS_VERSION) -HOST_LUAROCKS_DIR = $(LUAROCKS_DIR) -HOST_LUAROCKS_SOURCE = $(LUAROCKS_SOURCE) -HOST_LUAROCKS_SITE = $(LUAROCKS_SITE) - HOST_LUAROCKS_DEPENDENCIES = host-lua HOST_LUAROCKS_CONFIG = $(HOST_DIR)/etc/luarocks/config-$(LUA_ABIVERSION).lua diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 57da01da..c2aa607b 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -11,11 +11,6 @@ MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSI # ----------------------------------------------------------------------------- -HOST_MESON_VERSION = $(MESON_VERSION) -HOST_MESON_DIR = $(MESON_DIR) -HOST_MESON_SOURCE = $(MESON_SOURCE) -HOST_MESON_SITE = $(MESON_SITE) - HOST_MESON_DEPENDENCIES = host-ninja host-python3 host-python-setuptools HOST_MESON_BINARY = $(HOST_DIR)/bin/meson diff --git a/package/mtd-utils/mtd-utils.mk b/package/mtd-utils/mtd-utils.mk index 82c48fe2..38a715ae 100644 --- a/package/mtd-utils/mtd-utils.mk +++ b/package/mtd-utils/mtd-utils.mk @@ -49,11 +49,6 @@ mtd-utils: | $(TARGET_DIR) # ----------------------------------------------------------------------------- -HOST_MTD_UTILS_VERSION = $(MTD_UTILS_VERSION) -HOST_MTD_UTILS_DIR = $(MTD_UTILS_DIR) -HOST_MTD_UTILS_SOURCE = $(MTD_UTILS_SOURCE) -HOST_MTD_UTILS_SITE = $(MTD_UTILS_SITE) - HOST_MTD_UTILS_CONF_ENV = \ ZLIB_CFLAGS=" " \ ZLIB_LIBS="-lz" \ diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index 529f85d1..443899c4 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -11,10 +11,5 @@ MTOOLS_SITE = $(GNU_MIRROR)/mtools # ------------------------------------------------------------------------------ -HOST_MTOOLS_VERSION = $(MTOOLS_VERSION) -HOST_MTOOLS_DIR = $(MTOOLS_DIR) -HOST_MTOOLS_SOURCE = $(MTOOLS_SOURCE) -HOST_MTOOLS_SITE = $(MTOOLS_SITE) - host-mtools: | $(HOST_DIR) $(call host-autotools-package) diff --git a/package/ninja/ninja.mk b/package/ninja/ninja.mk index eda03804..ceb7ef6c 100644 --- a/package/ninja/ninja.mk +++ b/package/ninja/ninja.mk @@ -11,11 +11,6 @@ NINJA_SITE = $(call github,ninja-build,ninja,v$(NINJA_VERSION)) # ----------------------------------------------------------------------------- -HOST_NINJA_VERSION = $(NINJA_VERSION) -HOST_NINJA_DIR = $(NINJA_DIR) -HOST_NINJA_SOURCE = $(NINJA_SOURCE) -HOST_NINJA_SITE = $(NINJA_SITE) - HOST_NINJA_BINARY = $(HOST_DIR)/bin/ninja host-ninja: | $(HOST_DIR) diff --git a/package/parted/parted.mk b/package/parted/parted.mk index b4b3d6c8..1c9b146d 100644 --- a/package/parted/parted.mk +++ b/package/parted/parted.mk @@ -32,11 +32,6 @@ parted: | $(TARGET_DIR) # ----------------------------------------------------------------------------- -HOST_PARTED_VERSION = $(PARTED_VERSION) -HOST_PARTED_DIR = $(PARTED_DIR) -HOST_PARTED_SOURCE = $(PARTED_SOURCE) -HOST_PARTED_SITE = $(PARTED_SITE) - HOST_PARTED_AUTORECONF = YES HOST_PARTED_CONF_OPTS = \ diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk index 074a465d..1d669d83 100644 --- a/package/pkgconf/pkgconf.mk +++ b/package/pkgconf/pkgconf.mk @@ -11,11 +11,6 @@ PKGCONF_SITE = https://distfiles.dereferenced.org/pkgconf # ----------------------------------------------------------------------------- -HOST_PKGCONF_VERSION = $(PKGCONF_VERSION) -HOST_PKGCONF_DIR = $(PKGCONF_DIR) -HOST_PKGCONF_SOURCE = $(PKGCONF_SOURCE) -HOST_PKGCONF_SITE = $(PKGCONF_SITE) - HOST_PKG_CONFIG = $(HOST_DIR)/bin/pkg-config define HOST_PKGCONF_INSTALL_PKG_CONFIG diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 5fe06f46..42483868 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -11,11 +11,6 @@ PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ea/a3/3d3cbbb71 # ----------------------------------------------------------------------------- -HOST_PYTHON_SETUPTOOLS_VERSION = $(PYTHON_SETUPTOOLS_VERSION) -HOST_PYTHON_SETUPTOOLS_DIR = $(PYTHON_SETUPTOOLS_DIR) -HOST_PYTHON_SETUPTOOLS_SOURCE = $(PYTHON_SETUPTOOLS_SOURCE) -HOST_PYTHON_SETUPTOOLS_SITE = $(PYTHON_SETUPTOOLS_SITE) - HOST_PYTHON_SETUPTOOLS_DEPENDENCIES = host-python3 host-python-setuptools: | $(HOST_DIR) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 05c7d510..ee62ed7c 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -11,11 +11,6 @@ PYTHON3_SITE = https://www.python.org/ftp/python/$(PYTHON3_VERSION) # ------------------------------------------------------------------------------ -HOST_PYTHON3_VERSION = $(PYTHON3_VERSION) -HOST_PYTHON3_DIR = $(PYTHON3_DIR) -HOST_PYTHON3_SOURCE = $(PYTHON3_SOURCE) -HOST_PYTHON3_SITE = $(PYTHON3_SITE) - HOST_PYTHON3_BINARY = $(HOST_DIR)/bin/python3 HOST_PYTHON3_LIB_DIR = lib/python$(basename $(HOST_PYTHON3_VERSION)) diff --git a/package/qrencode/qrencode.mk b/package/qrencode/qrencode.mk index 35cb1ca1..89174d99 100644 --- a/package/qrencode/qrencode.mk +++ b/package/qrencode/qrencode.mk @@ -11,11 +11,6 @@ QRENCODE_SITE = https://fukuchi.org/works/qrencode # ----------------------------------------------------------------------------- -HOST_QRENCODE_VERSION = $(QRENCODE_VERSION) -HOST_QRENCODE_DIR = $(QRENCODE_DIR) -HOST_QRENCODE_SOURCE = $(QRENCODE_SOURCE) -HOST_QRENCODE_SITE = $(QRENCODE_SITE) - HOST_QRENCODE_DEPENDENCIES = host-libpng HOST_QRENCODE = $(HOST_DIR)/bin/qrencode diff --git a/package/u-boot/u-boot.mk b/package/u-boot/u-boot.mk index 38b8e4fe..16b9dad7 100644 --- a/package/u-boot/u-boot.mk +++ b/package/u-boot/u-boot.mk @@ -11,11 +11,6 @@ U_BOOT_SITE = ftp://ftp.denx.de/pub/u-boot # ------------------------------------------------------------------------------ -HOST_U_BOOT_VERSION = $(U_BOOT_VERSION) -HOST_U_BOOT_DIR = $(U_BOOT_DIR) -HOST_U_BOOT_SOURCE = $(U_BOOT_SOURCE) -HOST_U_BOOT_SITE = $(U_BOOT_SITE) - HOST_MKIMAGE = $(HOST_DIR)/bin/mkimage define HOST_U_BOOT_MAKE_DEFCONFIG diff --git a/package/waf/waf.mk b/package/waf/waf.mk index 723d7ae6..c0498d24 100644 --- a/package/waf/waf.mk +++ b/package/waf/waf.mk @@ -11,11 +11,6 @@ WAF_SITE = https://waf.io # ------------------------------------------------------------------------------ -HOST_WAF_VERSION = $(WAF_VERSION) -HOST_WAF_DIR = $(WAF_DIR) -HOST_WAF_SOURCE = $(WAF_SOURCE) -HOST_WAF_SITE = $(WAF_SITE) - HOST_WAF_BINARY = $(HOST_DIR)/bin/waf define HOST_WAF_INSTALL_BINARY diff --git a/package/zic/zic.mk b/package/zic/zic.mk index b272587e..4736a2aa 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -11,11 +11,6 @@ ZIC_SITE = https://data.iana.org/time-zones/releases # ------------------------------------------------------------------------------ -HOST_ZIC_VERSION = $(ZIC_VERSION) -HOST_ZIC_DIR = $(ZIC_DIR) -HOST_ZIC_SOURCE = $(ZIC_SOURCE) -HOST_ZIC_SITE = $(ZIC_SITE) - HOST_ZIC = $(HOST_DIR)/sbin/zic define HOST_ZIC_INSTALL_BINARY diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk index 1c15821b..9de4481f 100644 --- a/package/zlib/zlib.mk +++ b/package/zlib/zlib.mk @@ -28,11 +28,6 @@ zlib: | $(TARGET_DIR) # ----------------------------------------------------------------------------- -HOST_ZLIB_VERSION = $(ZLIB_VERSION) -HOST_ZLIB_DIR = $(ZLIB_DIR) -HOST_ZLIB_SOURCE = $(ZLIB_SOURCE) -HOST_ZLIB_SITE = $(ZLIB_SITE) - HOST_ZLIB_CONF_ENV = \ $(HOST_CONFIGURE_ENV)