diff --git a/make/linux-drivers.mk b/make/linux-drivers.mk index cde3e170..a3d59d5c 100644 --- a/make/linux-drivers.mk +++ b/make/linux-drivers.mk @@ -10,7 +10,7 @@ RTL8192EU_SITE = https://github.com/mange/$(RTL8192EU_SOURCE) rtl8192eu: kernel-$(BOXTYPE) | $(TARGET_DIR) $(REMOVE)/$(RTL8192EU_DIR) - $(GET-GIT-SOURCE) $(RTL8192EU_SITE) $(DL_DIR)/$(RTL8192EU_SOURCE) + $(GET_GIT_SOURCE) $(RTL8192EU_SITE) $(DL_DIR)/$(RTL8192EU_SOURCE) $(CPDIR)/$(RTL8192EU_SOURCE) $(CHDIR)/$(RTL8192EU_DIR); \ $(MAKE) $(KERNEL_MAKE_VARS); \ diff --git a/make/target-libs-static.mk b/make/target-libs-static.mk index e7f8f099..2df27463 100644 --- a/make/target-libs-static.mk +++ b/make/target-libs-static.mk @@ -20,7 +20,7 @@ CORTEX_STRINGS_SOURCE = cortex-strings-$(CORTEX_STRINGS_VERSION).tar.bz2 CORTEX_STRINGS_SITE = http://git.linaro.org/git-ro/toolchain/cortex-strings.git $(DL_DIR)/$(CORTEX_STRINGS_SOURCE): - $(GET-GIT-ARCHIVE) $(CORTEX_STRINGS_SITE) $(CORTEX_STRINGS_VERSION) $(@F) $(DL_DIR) + $(GET_GIT_ARCHIVE) $(CORTEX_STRINGS_SITE) $(CORTEX_STRINGS_VERSION) $(@F) $(DL_DIR) CORTEX_STRINGS_CONF_ENV = \ CFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_includedir)" \ diff --git a/make/target-libs.mk b/make/target-libs.mk index 7c1313bd..ba52e55d 100644 --- a/make/target-libs.mk +++ b/make/target-libs.mk @@ -38,9 +38,6 @@ LIBFUSE_DIR = fuse-$(LIBFUSE_VERSION) LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz LIBFUSE_SITE = https://github.com/libfuse/libfuse/releases/download/fuse-$(LIBFUSE_VERSION) -$(DL_DIR)/$(LIBFUSE_SOURCE): - $(download) $(LIBFUSE_SITE)/$(LIBFUSE_SOURCE) - LIBFUSE_CONF_OPTS = \ --datarootdir=$(REMOVE_datarootdir) \ --disable-static \ @@ -51,7 +48,7 @@ LIBFUSE_CONF_OPTS = \ --enable-lib \ --enable-silent-rules -libfuse: $(DL_DIR)/$(LIBFUSE_SOURCE) | $(TARGET_DIR) +libfuse: | $(TARGET_DIR) $(call autotools-package) -rm -r $(TARGET_sysconfdir)/udev -rm $(TARGET_sysconfdir)/init.d/fuse @@ -63,14 +60,11 @@ LIBUPNP_DIR = libupnp-$(LIBUPNP_VERSION) LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2 LIBUPNP_SITE = http://sourceforge.net/projects/pupnp/files/pupnp/libUPnP%20$(LIBUPNP_VERSION) -$(DL_DIR)/$(LIBUPNP_SOURCE): - $(download) $(LIBUPNP_SITE)/$(LIBUPNP_SOURCE) - LIBUPNP_CONV_OPTS = \ --enable-shared \ --disable-static -libupnp: $(DL_DIR)/$(LIBUPNP_SOURCE) | $(TARGET_DIR) +libupnp: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -80,15 +74,12 @@ LIBDVBSI_DIR = libdvbsi++-$(LIBDVBSI_VERSION) LIBDVBSI_SOURCE = libdvbsi++-$(LIBDVBSI_VERSION).tar.bz2 LIBDVBSI_SITE = https://github.com/mtdcr/libdvbsi/releases/download/$(LIBDVBSI_VERSION) -$(DL_DIR)/$(LIBDVBSI_SOURCE): - $(download) $(LIBDVBSI_SITE)/$(LIBDVBSI_SOURCE) - LIBDVBSI_CONV_OPTS = \ --enable-silent-rules \ --enable-shared \ --disable-static -libdvbsi: $(DL_DIR)/$(LIBDVBSI_SOURCE) | $(TARGET_DIR) +libdvbsi: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -102,7 +93,7 @@ LIBDVBCSA_AUTORECONF = YES libdvbcsa: | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) - $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(GET_GIT_SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) $(CPDIR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ $(CONFIGURE); \ @@ -139,9 +130,6 @@ LIBCURL_DIR = curl-$(LIBCURL_VERSION) LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2 LIBCURL_SITE = https://curl.haxx.se/download -$(DL_DIR)/$(LIBCURL_SOURCE): - $(download) $(LIBCURL_SITE)/$(LIBCURL_SOURCE) - LIBCURL_DEPENDENCIES = zlib openssl rtmpdump ca-bundle LIBCURL_CONFIG_SCRIPTS = curl-config @@ -171,7 +159,7 @@ LIBCURL_CONF_OPTS = \ --with-librtmp=$(TARGET_libdir) \ --enable-optimize -libcurl: $(LIBCURL_DEPENDENCIES) $(DL_DIR)/$(LIBCURL_SOURCE) | $(TARGET_DIR) +libcurl: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -181,9 +169,6 @@ LIBPNG_DIR = libpng-$(LIBPNG_VERSION) LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz LIBPNG_SITE = https://sourceforge.net/projects/libpng/files/libpng16/$(LIBPNG_VERSION) -$(DL_DIR)/$(LIBPNG_SOURCE): - $(download) $(LIBPNG_SITE)/$(LIBPNG_SOURCE) - LIBPNG_DEPENDENCIES = zlib LIBPNG_CONFIG_SCRIPTS = libpng16-config @@ -193,7 +178,7 @@ LIBPNG_CONF_OPTS = \ --disable-static \ $(if $(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse),--enable-arm-neon,--disable-arm-neon) -libpng: $(LIBPNG_DEPENDENCIES) $(DL_DIR)/$(LIBPNG_SOURCE) | $(TARGET_DIR) +libpng: | $(TARGET_DIR) $(call autotools-package) -rm $(addprefix $(TARGET_bindir)/,libpng-config) @@ -391,13 +376,10 @@ LIBUSB_DIR = libusb-$(LIBUSB_VERSION) LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION) -$(DL_DIR)/$(LIBUSB_SOURCE): - $(download) $(LIBUSB_SITE)/$(LIBUSB_SOURCE) - LIBUSB_CONF_OPTS = \ --disable-udev -libusb: $(DL_DIR)/$(LIBUSB_SOURCE) | $(TARGET_DIR) +libusb: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -407,14 +389,11 @@ LIBUSB_COMPAT_DIR = libusb-compat-$(LIBUSB_COMPAT_VERSION) LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2 LIBUSB_COMPAT_SITE = https://github.com/libusb/libusb-compat-0.1/releases/download/v$(LIBUSB_COMPAT_VERSION) -$(DL_DIR)/$(LIBUSB_COMPAT_SOURCE): - $(download) $(LIBUSB_COMPAT_SITE)/$(LIBUSB_COMPAT_SOURCE) - LIBUSB_COMPAT_CONFIG_SCRIPTS = libusb-config LIBUSB_COMPAT_DEPENDENCIES = libusb -libusb-compat: $(LIBUSB_COMPAT_DEPENDENCIES) $(DL_DIR)/$(LIBUSB_COMPAT_SOURCE) | $(TARGET_DIR) +libusb-compat: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -424,9 +403,6 @@ LIBGD_DIR = libgd-$(LIBGD_VERSION) LIBGD_SOURCE = libgd-$(LIBGD_VERSION).tar.xz LIBGD_SITE = https://github.com/libgd/libgd/releases/download/gd-$(LIBGD_VERSION) -$(DL_DIR)/$(LIBGD_SOURCE): - $(download) $(LIBGD_SITE)/$(LIBGD_SOURCE) - LIBGD_DEPENDENCIES = zlib libpng libjpeg-turbo freetype LIBGD_CONF_OPTS = \ @@ -435,7 +411,7 @@ LIBGD_CONF_OPTS = \ --without-xpm \ --without-x -libgd: $(LIBGD_DEPENDENCIES) $(DL_DIR)/$(LIBGD_SOURCE) | $(TARGET_DIR) +libgd: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -452,7 +428,7 @@ LIBDPF_MAKE_OPTS = \ libdpf: $(LIBDPF_DEPENDENCIES) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) - $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(GET_GIT_SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) $(CPDIR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ $(APPLY_PATCHES); \ @@ -471,13 +447,10 @@ LZO_DIR = lzo-$(LZO_VERSION) LZO_SOURCE = lzo-$(LZO_VERSION).tar.gz LZO_SITE = https://www.oberhumer.com/opensource/lzo/download -$(DL_DIR)/$(LZO_SOURCE): - $(download) $(LZO_SITE)/$(LZO_SOURCE) - LZO_CONF_OPTS = \ --docdir=$(REMOVE_docdir) -lzo: $(DL_DIR)/$(LZO_SOURCE) | $(TARGET_DIR) +lzo: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -516,9 +489,6 @@ EXPAT_DIR = expat-$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.bz2 EXPAT_SITE = https://sourceforge.net/projects/expat/files/expat/$(EXPAT_VERSION) -$(DL_DIR)/$(EXPAT_SOURCE): - $(download) $(EXPAT_SITE)/$(EXPAT_SOURCE) - EXPAT_AUTORECONF = YES EXPAT_CONF_OPTS = \ @@ -526,7 +496,7 @@ EXPAT_CONF_OPTS = \ --without-xmlwf \ --without-docbook -expat: $(DL_DIR)/$(EXPAT_SOURCE) | $(TARGET_DIR) +expat: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -578,9 +548,6 @@ LIBASS_DIR = libass-$(LIBASS_VERSION) LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz LIBASS_SITE = https://github.com/libass/libass/releases/download/$(LIBASS_VERSION) -$(DL_DIR)/$(LIBASS_SOURCE): - $(download) $(LIBASS_SITE)/$(LIBASS_SOURCE) - LIBASS_DEPENDENCIES = freetype fribidi LIBASS_CONF_OPTS = \ @@ -590,7 +557,7 @@ LIBASS_CONF_OPTS = \ --disable-harfbuzz \ --disable-require-system-font-provider -libass: $(LIBASS_DEPENDENCIES) $(DL_DIR)/$(LIBASS_SOURCE) | $(TARGET_DIR) +libass: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -640,9 +607,6 @@ LIBGCRYPT_DIR = libgcrypt-$(LIBGCRYPT_VERSION) LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.gz LIBGCRYPT_SITE = ftp://ftp.gnupg.org/gcrypt/libgcrypt -$(DL_DIR)/$(LIBGCRYPT_SOURCE): - $(download) $(LIBGCRYPT_SITE)/$(LIBGCRYPT_SOURCE) - LIBGCRYPT_DEPENDENCIES = libgpg-error LIBGCRYPT_CONFIG_SCRIPTS = libgcrypt-config @@ -655,7 +619,7 @@ LIBGCRYPT_CONF_OPTS = \ --disable-static \ --disable-tests -libgcrypt: $(LIBGCRYPT_DEPENDENCIES) $(DL_DIR)/$(LIBGCRYPT_SOURCE) | $(TARGET_DIR) +libgcrypt: | $(TARGET_DIR) $(call autotools-package) -rm $(addprefix $(TARGET_bindir)/,dumpsexp hmac256 mpicalc) @@ -730,9 +694,6 @@ LIBXML2_DIR = libxml2-$(LIBXML2_VERSION) LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.gz LIBXML2_SITE = http://xmlsoft.org/sources -$(DL_DIR)/$(LIBXML2_SOURCE): - $(download) $(LIBXML2_SITE)/$(LIBXML2_SOURCE) - LIBXML2_CONFIG_SCRIPTS = xml2-config LIBXML2_CONF_OPTS = \ @@ -749,7 +710,7 @@ LIBXML2_CONF_OPTS = \ --without-lzma \ --without-schematron -libxml2: $(DL_DIR)/$(LIBXML2_SOURCE) | $(TARGET_DIR) +libxml2: | $(TARGET_DIR) $(call autotools-package) -rm -r $(TARGET_libdir)/cmake -rm $(addprefix $(TARGET_libdir)/,xml2Conf.sh) @@ -774,13 +735,10 @@ LIBROXML_DIR = libroxml-$(LIBROXML_VERSION) LIBROXML_SOURCE = libroxml-$(LIBROXML_VERSION).tar.gz LIBROXML_SITE = http://download.libroxml.net/pool/v3.x -$(DL_DIR)/$(LIBROXML_SOURCE): - $(download) $(LIBROXML_SITE)/$(LIBROXML_SOURCE) - LIBROXML_CONF_OPTS = \ --disable-roxml -libroxml: $(DL_DIR)/$(LIBROXML_SOURCE) | $(TARGET_DIR) +libroxml: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -790,9 +748,6 @@ LIBXSLT_DIR = libxslt-$(LIBXSLT_VERSION) LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.gz LIBXSLT_SITE = ftp://xmlsoft.org/libxml2 -$(DL_DIR)/$(LIBXSLT_SOURCE): - $(download) $(LIBXSLT_SITE)/$(LIBXSLT_SOURCE) - LIBXSLT_DEPENDENCIES = libxml2 LIBXSLT_CONFIG_SCRIPTS = xslt-config @@ -806,7 +761,7 @@ LIBXSLT_CONF_OPTS = \ --without-debug \ --without-mem-debug -libxslt: $(LIBXSLT_DEPENDENCIES) $(DL_DIR)/$(LIBXSLT_SOURCE) | $(TARGET_DIR) +libxslt: | $(TARGET_DIR) $(call autotools-package) -rm -r $(TARGET_libdir)/libxslt-plugins/ -rm $(addprefix $(TARGET_libdir)/,xsltConf.sh) @@ -841,16 +796,13 @@ LIBTIRPC_DIR = libtirpc-$(LIBTIRPC_VERSION) LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2 LIBTIRPC_SITE = https://sourceforge.net/projects/libtirpc/files/libtirpc/$(LIBTIRPC_VERSION) -$(DL_DIR)/$(LIBTIRPC_SOURCE): - $(download) $(LIBTIRPC_SITE)/$(LIBTIRPC_SOURCE) - LIBTIRPC_AUTORECONF = YES LIBTIRPC_CONF_OPTS = \ --disable-gssapi \ --enable-silent-rules -libtirpc: $(DL_DIR)/$(LIBTIRPC_SOURCE) | $(TARGET_DIR) +libtirpc: | $(TARGET_DIR) $(call autotools-package) ifeq ($(BOXSERIES),hd1) $(SED) '/^\(udp\|tcp\)6/ d' $(TARGET_sysconfdir)/netconfig @@ -863,16 +815,13 @@ CONFUSE_DIR = confuse-$(CONFUSE_VERSION) CONFUSE_SOURCE = confuse-$(CONFUSE_VERSION).tar.xz CONFUSE_SITE = https://github.com/martinh/libconfuse/releases/download/v$(CONFUSE_VERSION) -$(DL_DIR)/$(CONFUSE_SOURCE): - $(download) $(CONFUSE_SITE)/$(CONFUSE_SOURCE) - CONFUSE_CONF_OPTS = \ --docdir=$(REMOVE_docdir) \ --enable-silent-rules \ --enable-static \ --disable-shared -confuse: $(DL_DIR)/$(CONFUSE_SOURCE) | $(TARGET_DIR) +confuse: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -882,16 +831,13 @@ LIBITE_DIR = libite-$(LIBITE_VERSION) LIBITE_SOURCE = libite-$(LIBITE_VERSION).tar.xz LIBITE_SITE = https://github.com/troglobit/libite/releases/download/v$(LIBITE_VERSION) -$(DL_DIR)/$(LIBITE_SOURCE): - $(download) $(LIBITE_SITE)/$(LIBITE_SOURCE) - LIBITE_CONF_OPTS = \ --docdir=$(REMOVE_docdir) \ --enable-silent-rules \ --enable-static \ --disable-shared -libite: $(DL_DIR)/$(LIBITE_SOURCE) | $(TARGET_DIR) +libite: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -901,9 +847,6 @@ LIBMAD_DIR = libmad-$(LIBMAD_VERSION) LIBMAD_SOURCE = libmad-$(LIBMAD_VERSION).tar.gz LIBMAD_SITE = https://sourceforge.net/projects/mad/files/libmad/$(LIBMAD_VERSION) -$(DL_DIR)/$(LIBMAD_SOURCE): - $(download) $(LIBMAD_SITE)/$(LIBMAD_SOURCE) - LIBMAD_AUTORECONF = YES LIBMAD_CONF_OPTS = \ @@ -912,7 +855,7 @@ LIBMAD_CONF_OPTS = \ --enable-fpm=arm \ --enable-sso -libmad: $(DL_DIR)/$(LIBMAD_SOURCE) | $(TARGET_DIR) +libmad: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -922,9 +865,6 @@ LIBVORBIS_DIR = libvorbis-$(LIBVORBIS_VERSION) LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.xz LIBVORBIS_SITE = https://downloads.xiph.org/releases/vorbis -$(DL_DIR)/$(LIBVORBIS_SOURCE): - $(download) $(LIBVORBIS_SITE)/$(LIBVORBIS_SOURCE) - LIBVORBIS_DEPENDENCIES = libogg LIBVORBIS_AUTORECONF = YES @@ -935,7 +875,7 @@ LIBVORBIS_CONF_OPTS = \ --disable-examples \ --disable-oggtest -libvorbis: $(LIBVORBIS_DEPENDENCIES) $(DL_DIR)/$(LIBVORBIS_SOURCE) | $(TARGET_DIR) +libvorbis: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -971,14 +911,11 @@ LIBOGG_DIR = libogg-$(LIBOGG_VERSION) LIBOGG_SOURCE = libogg-$(LIBOGG_VERSION).tar.gz LIBOGG_SITE = http://downloads.xiph.org/releases/ogg -$(DL_DIR)/$(LIBOGG_SOURCE): - $(download) $(LIBOGG_SITE)/$(LIBOGG_SOURCE) - LIBOGG_CONF_OPTS = \ --datarootdir=$(REMOVE_datarootdir) \ --enable-shared -libogg: $(DL_DIR)/$(LIBOGG_SOURCE) | $(TARGET_DIR) +libogg: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -988,14 +925,11 @@ LIBEXIF_DIR = libexif-$(LIBEXIF_VERSION) LIBEXIF_SOURCE = libexif-$(LIBEXIF_VERSION).tar.xz LIBEXIF_SITE = https://github.com/libexif/libexif/releases/download/libexif-$(subst .,_,$(LIBEXIF_VERSION))-release -$(DL_DIR)/$(LIBEXIF_SOURCE): - $(download) $(LIBEXIF_SITE)/$(LIBEXIF_SOURCE) - LIBEXIF_CONF_OPTS = \ --datarootdir=$(REMOVE_datarootdir) \ --with-doc-dir=$(REMOVE_docdir) -libexif: $(DL_DIR)/$(LIBEXIF_SOURCE) | $(TARGET_DIR) +libexif: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -1005,14 +939,11 @@ FRIBIDI_DIR = fribidi-$(FRIBIDI_VERSION) FRIBIDI_SOURCE = fribidi-$(FRIBIDI_VERSION).tar.xz FRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(FRIBIDI_VERSION) -$(DL_DIR)/$(FRIBIDI_SOURCE): - $(download) $(FRIBIDI_SITE)/$(FRIBIDI_SOURCE) - FRIBIDI_CONF_OPTS = \ --disable-debug \ --disable-deprecated -fribidi: $(DL_DIR)/$(FRIBIDI_SOURCE) | $(TARGET_DIR) +fribidi: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -1022,16 +953,13 @@ LIBFFI_DIR = libffi-$(LIBFFI_VERSION) LIBFFI_SOURCE = libffi-$(LIBFFI_VERSION).tar.gz LIBFFI_SITE = https://github.com/libffi/libffi/releases/download/v$(HOST_LIBFFI_VERSION) -$(DL_DIR)/$(LIBFFI_SOURCE): - $(download) $(LIBFFI_SITE)/$(LIBFFI_SOURCE) - LIBFFI_AUTORECONF = YES LIBFFI_CONF_OPTS = \ --datarootdir=$(REMOVE_datarootdir) \ $(if $(filter $(BOXSERIES),hd1),--enable-static --disable-shared) -libffi: $(DL_DIR)/$(LIBFFI_SOURCE) | $(TARGET_DIR) +libffi: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -1097,9 +1025,6 @@ ALSA_LIB_DIR = alsa-lib-$(ALSA_LIB_VERSION) ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE = https://www.alsa-project.org/files/pub/lib -$(DL_DIR)/$(ALSA_LIB_SOURCE): - $(download) $(ALSA_LIB_SITE)/$(ALSA_LIB_SOURCE) - ALSA_LIB_AUTORECONF = YES ALSA_LIB_CONF_OPTS = \ @@ -1119,7 +1044,7 @@ ALSA_LIB_CONF_OPTS = \ --disable-python \ --disable-topology -alsa-lib: $(DL_DIR)/$(ALSA_LIB_SOURCE) +alsa-lib: | $(TARGET_DIR) $(call autotools-package) find $(TARGET_datadir)/alsa/cards/ -name '*.conf' ! -name 'aliases.conf' | xargs --no-run-if-empty rm find $(TARGET_datadir)/alsa/pcm/ -name '*.conf' ! -name 'default.conf' ! -name 'dmix.conf' ! -name 'dsnoop.conf' | xargs --no-run-if-empty rm @@ -1132,13 +1057,10 @@ POPT_DIR = popt-$(POPT_VERSION) POPT_SOURCE = popt-$(POPT_VERSION).tar.gz POPT_SITE = ftp://anduin.linuxfromscratch.org/BLFS/popt -$(DL_DIR)/$(POPT_SOURCE): - $(download) $(POPT_SITE)/$(POPT_SOURCE) - POPT_CONF_OPTS = \ --datarootdir=$(REMOVE_datarootdir) -popt: $(DL_DIR)/$(POPT_SOURCE) | $(TARGET_DIR) +popt: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -1190,7 +1112,7 @@ GRAPHLCD_BASE_DEPENDENCIES = freetype libiconv libusb graphlcd-base: $(GRAPHLCD_BASE_DEPENDENCIES) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) - $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(GET_GIT_SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) $(CPDIR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ $(call apply_patches,$(addprefix $(PKG_PATCHES_DIR)/,$(PKG_PATCH))); \ diff --git a/make/target-lua.mk b/make/target-lua.mk index aabfaa5c..59830e40 100644 --- a/make/target-lua.mk +++ b/make/target-lua.mk @@ -119,7 +119,7 @@ LUA_CURL_MAKE_OPTS = \ lua-curl: $(LUA_CURL_DEPENDENCIES) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) - $(GET-GIT-SOURCE) $(PKG_SITE) $(DL_DIR)/$(PKG_SOURCE) + $(GET_GIT_SOURCE) $(PKG_SITE) $(DL_DIR)/$(PKG_SOURCE) $(CPDIR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPTS); \ diff --git a/make/target-neutrino-plugins.mk b/make/target-neutrino-plugins.mk index 0ae3d945..810843c9 100644 --- a/make/target-neutrino-plugins.mk +++ b/make/target-neutrino-plugins.mk @@ -201,7 +201,7 @@ NEUTRINO_MEDIATHEK_SITE = https://github.com/neutrino-mediathek neutrino-mediathek: $(SHARE_PLUGINS) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) - $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(GET_GIT_SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) $(CPDIR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ $(INSTALL_COPY) plugins/* $(SHARE_PLUGINS)/; \ diff --git a/make/target-tools-unused.mk b/make/target-tools-unused.mk index aa7d52ba..7e56c611 100644 --- a/make/target-tools-unused.mk +++ b/make/target-tools-unused.mk @@ -150,7 +150,7 @@ ASTRA_SM_CONF_OPTS = \ astra-sm: $(ASTRA_SM_DEPENDENCIES) | $(TARGET_DIR) $(REMOVE)/$(ASTRA_SM_DIR) - $(GET-GIT-SOURCE) $(ASTRA_SM_SITE)/$(ASTRA_SM_SOURCE) $(DL_DIR)/$(ASTRA_SM_SOURCE) + $(GET_GIT_SOURCE) $(ASTRA_SM_SITE)/$(ASTRA_SM_SOURCE) $(DL_DIR)/$(ASTRA_SM_SOURCE) $(CPDIR)/$(ASTRA_SM_SOURCE) $(CHDIR)/$(ASTRA_SM_DIR); \ sed -i 's:(CFLAGS):(CFLAGS_FOR_BUILD):' tools/Makefile.am; \ diff --git a/make/target-tools.mk b/make/target-tools.mk index 3800358f..80094784 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -255,9 +255,6 @@ COREUTILS_DIR = coreutils-$(COREUTILS_VERSION) COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz COREUTILS_SITE = $(GNU_MIRROR)/coreutils -$(DL_DIR)/$(COREUTILS_SOURCE): - $(download) $(COREUTILS_SITE)/$(COREUTILS_SOURCE) - COREUTILS_AUTORECONF = YES COREUTILS_CONF_OPTS = \ @@ -277,7 +274,7 @@ COREUTILS_CONF_OPTS = \ COREUTILS_BINARIES = touch -coreutils: $(DL_DIR)/$(COREUTILS_SOURCE) | $(TARGET_DIR) +coreutils: | $(TARGET_DIR) $(call autotools-package) for bin in $($(PKG)_BINARIES); do \ rm -f $(TARGET_base_bindir)/$$bin; \ @@ -292,9 +289,6 @@ PROCPS_NG_DIR = procps-ng-$(PROCPS_NG_VERSION) PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz PROCPS_NG_SITE = http://sourceforge.net/projects/procps-ng/files/Production -$(DL_DIR)/$(PROCPS_NG_SOURCE): - $(download) $(PROCPS_NG_SITE)/$(PROCPS_NG_SOURCE) - PROCPS_NG_DEPENDENCIES = ncurses PROCPS_NG_AUTORECONF = YES @@ -314,7 +308,7 @@ PROCPS_NG_CONF_OPTS = \ PROCPS_NG_BINARIES = ps top -procps-ng: $(PROCPS_NG_DEPENDENCIES) $(DL_DIR)/$(PROCPS_NG_SOURCE) | $(TARGET_DIR) +procps-ng: | $(TARGET_DIR) $(call autotools-package) $(INSTALL_DATA) -D $(PKG_FILES_DIR)/sysctl.conf $(TARGET_sysconfdir)/sysctl.conf $(INSTALL) -d $(TARGET_sysconfdir)/sysctl.d @@ -333,9 +327,6 @@ MTD_UTILS_DIR = mtd-utils-$(MTD_UTILS_VERSION) MTD_UTILS_SOURCE = mtd-utils-$(MTD_UTILS_VERSION).tar.bz2 MTD_UTILS_SITE = ftp://ftp.infradead.org/pub/mtd-utils -$(DL_DIR)/$(MTD_UTILS_SOURCE): - $(download) $(MTD_UTILS_SITE)/$(MTD_UTILS_SOURCE) - MTD_UTILS_DEPENDENCIES = MTD_UTILS_CONF_OPTS = \ @@ -362,7 +353,7 @@ ifeq ($(BOXSERIES),hd2) MTD_UTILS_SBINARIES += nanddump nandtest nandwrite mkfs.jffs2 endif -mtd-utils: $(MTD_UTILS_DEPENDENCIES) $(DL_DIR)/$(MTD_UTILS_SOURCE) | $(TARGET_DIR) +mtd-utils: | $(TARGET_DIR) $(call autotools-package) for sbin in $($(PKG)_SBINARIES); do \ rm -f $(TARGET_sbindir)/$$sbin; \ @@ -377,9 +368,6 @@ DOSFSTOOLS_DIR = dosfstools-$(DOSFSTOOLS_VERSION) DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.xz DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VERSION) -$(DL_DIR)/$(DOSFSTOOLS_SOURCE): - $(download) $(DOSFSTOOLS_SITE)/$(DOSFSTOOLS_SOURCE) - DOSFSTOOLS_CFLAGS = $(TARGET_CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fomit-frame-pointer DOSFSTOOLS_AUTORECONF = YES @@ -392,7 +380,7 @@ DOSFSTOOLS_CONF_OPTS = \ --enable-compat-symlinks \ CFLAGS="$(DOSFSTOOLS_CFLAGS)" -dosfstools: $(DL_DIR)/$(DOSFSTOOLS_SOURCE) | $(TARGET_DIR) +dosfstools: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -402,9 +390,6 @@ NTFS_3G_DIR = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION) NTFS_3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION).tgz NTFS_3G_SITE = https://tuxera.com/opensource -$(DL_DIR)/$(NTFS_3G_SOURCE): - $(download) $(NTFS_3G_SITE)/$(NTFS_3G_SOURCE) - NTFS_3G_DEPENDENCIES = libfuse NTFS_3G_CONF_OPTS = \ @@ -418,7 +403,7 @@ NTFS_3G_CONF_OPTS = \ --disable-library \ --with-fuse=external -ntfs-3g: $(NTFS_3G_DEPENDENCIES) $(DL_DIR)/$(NTFS_3G_SOURCE) | $(TARGET_DIR) +ntfs-3g: | $(TARGET_DIR) $(call autotools-package) -rm $(addprefix $(TARGET_base_bindir)/,lowntfs-3g ntfs-3g.probe) -rm $(addprefix $(TARGET_base_sbindir)/,mount.lowntfs-3g) @@ -431,9 +416,6 @@ FUSE_EXFAT_DIR = fuse-exfat-$(FUSE_EXFAT_VERSION) FUSE_EXFAT_SOURCE = fuse-exfat-$(FUSE_EXFAT_VERSION).tar.gz FUSE_EXFAT_SITE = https://github.com/relan/exfat/releases/download/v$(FUSE_EXFAT_VERSION) -$(DL_DIR)/$(FUSE_EXFAT_SOURCE): - $(download) $(FUSE_EXFAT_SITE)/$(FUSE_EXFAT_SOURCE) - FUSE_EXFAT_DEPENDENCIES = libfuse FUSE_EXFAT_AUTORECONF = YES @@ -445,7 +427,7 @@ FUSE_EXFAT_CONF_OPTS = \ --libdir=$(libdir) \ --docdir=$(REMOVE_docdir) -fuse-exfat: $(FUSE_EXFAT_DEPENDENCIES) $(DL_DIR)/$(FUSE_EXFAT_SOURCE) | $(TARGET_DIR) +fuse-exfat: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -455,9 +437,6 @@ EXFAT_UTILS_DIR = exfat-utils-$(EXFAT_UTILS_VERSION) EXFAT_UTILS_SOURCE = exfat-utils-$(EXFAT_UTILS_VERSION).tar.gz EXFAT_UTILS_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_UTILS_VERSION) -$(DL_DIR)/$(EXFAT_UTILS_SOURCE): - $(download) $(EXFAT_UTILS_SITE)/$(EXFAT_UTILS_SOURCE) - EXFAT_UTILS_DEPENDENCIES = fuse-exfat EXFAT_UTILS_AUTORECONF = YES @@ -469,7 +448,7 @@ EXFAT_UTILS_CONF_OPTS = \ --libdir=$(libdir) \ --docdir=$(REMOVE_docdir) -exfat-utils: $(EXFAT_UTILS_DEPENDENCIES) $(DL_DIR)/$(EXFAT_UTILS_SOURCE) | $(TARGET_DIR) +exfat-utils: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -602,9 +581,6 @@ F2FS_TOOLS_DIR = f2fs-tools-$(F2FS_TOOLS_VERSION) F2FS_TOOLS_SOURCE = f2fs-tools-$(F2FS_TOOLS_VERSION).tar.gz F2FS_TOOLS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot -$(DL_DIR)/$(F2FS_TOOLS_SOURCE): - $(download) $(F2FS_TOOLS_SITE)/$(F2FS_TOOLS_SOURCE) - F2FS_TOOLS_DEPENDENCIES = util-linux F2FS_TOOLS_AUTORECONF = YES @@ -619,7 +595,7 @@ F2FS_TOOLS_CONF_OPTS = \ --libdir=$(libdir) \ --without-selinux -f2fs-tools: $(F2FS_TOOLS_DEPENDENCIES) $(DL_DIR)/$(F2FS_TOOLS_SOURCE) | $(TARGET_DIR) +f2fs-tools: | $(TARGET_DIR) $(call autotools-package) -rm $(addprefix $(TARGET_base_sbindir)/,sg_write_buffer) @@ -630,9 +606,6 @@ UTIL_LINUX_DIR = util-linux-$(UTIL_LINUX_VERSION) UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(KERNEL_MIRROR)/linux/utils/util-linux/v$(basename $(UTIL_LINUX_VERSION)) -$(DL_DIR)/$(UTIL_LINUX_SOURCE): - $(download) $(UTIL_LINUX_SITE)/$(UTIL_LINUX_SOURCE) - UTIL_LINUX_DEPENDENCIES = ncurses zlib UTIL_LINUX_AUTORECONF = YES @@ -672,7 +645,7 @@ UTIL_LINUX_CONF_OPTS = \ --without-udev \ --without-utempter -util-linux: $(UTIL_LINUX_DEPENDENCIES) $(DL_DIR)/$(UTIL_LINUX_SOURCE) | $(TARGET_DIR) +util-linux: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -687,9 +660,6 @@ OPENVPN_DIR = openvpn-$(OPENVPN_VERSION) OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://build.openvpn.net/downloads/releases -$(DL_DIR)/$(OPENVPN_SOURCE): - $(download) $(OPENVPN_SITE)/$(OPENVPN_SOURCE) - OPENVPN_DEPENDENCIES = lzo openssl OPENVPN_CONF_ENV = \ @@ -710,7 +680,7 @@ OPENVPN_CONF_OPTS = \ --disable-plugins \ --disable-pkcs11 -openvpn: $(OPENVPN_DEPENDENCIES) $(DL_DIR)/$(OPENVPN_SOURCE) | $(TARGET_DIR) +openvpn: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -805,10 +775,7 @@ IPERF_DIR = iperf-$(IPERF_VERSION) IPERF_SOURCE = iperf-$(IPERF_VERSION)-source.tar.gz IPERF_SITE = https://iperf.fr/download/source -$(DL_DIR)/$(IPERF_SOURCE): - $(download) $(IPERF_SITE)/$(IPERF_SOURCE) - -iperf: $(DL_DIR)/$(IPERF_SOURCE) | $(TARGET_DIR) +iperf: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -818,9 +785,6 @@ PARTED_DIR = parted-$(PARTED_VERSION) PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz PARTED_SITE = $(GNU_MIRROR)/parted -$(DL_DIR)/$(PARTED_SOURCE): - $(download) $(PARTED_SITE)/$(PARTED_SOURCE) - PARTED_DEPENDENCIES = util-linux ifeq ($(BOXTYPE),$(filter $(BOXTYPE),armbox mipsbox)) @@ -839,7 +803,7 @@ PARTED_CONF_OPTS = \ --disable-device-mapper \ --without-readline -parted: $(PARTED_DEPENDENCIES) $(DL_DIR)/$(PARTED_SOURCE) | $(TARGET_DIR) +parted: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -869,12 +833,9 @@ LESS_DIR = less-$(LESS_VERSION) LESS_SOURCE = less-$(LESS_VERSION).tar.gz LESS_SITE = $(GNU_MIRROR)/less -$(DL_DIR)/$(LESS_SOURCE): - $(download) $(LESS_SITE)/$(LESS_SOURCE) - LESS_DEPENDENCIES = ncurses -less: $(LESS_DEPENDENCIES) $(DL_DIR)/$(LESS_SOURCE) | $(TARGET_DIR) +less: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -984,13 +945,10 @@ SQLITE_DIR = sqlite-autoconf-$(SQLITE_VERSION) SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = http://www.sqlite.org/2020 -$(DL_DIR)/$(SQLITE_SOURCE): - $(download) $(SQLITE_SITE)/$(SQLITE_SOURCE) - SQLITE_CONF_OPTS = \ --bindir=$(REMOVE_bindir) -sqlite: $(DL_DIR)/$(SQLITE_SOURCE) | $(TARGET_DIR) +sqlite: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -1428,15 +1386,12 @@ SG3_UTILS_DIR = sg3_utils-$(SG3_UTILS_VERSION) SG3_UTILS_SOURCE = sg3_utils-$(SG3_UTILS_VERSION).tar.xz SG3_UTILS_SITE = http://sg.danny.cz/sg/p -$(DL_DIR)/$(SG3_UTILS_SOURCE): - $(download) $(SG3_UTILS_SITE)/$(SG3_UTILS_SOURCE) - SG3_UTILS_CONF_OPTS = \ --bindir=$(bindir).$(@F) SG3_UTILS_BINARIES = sg_start -sg3_utils: $(DL_DIR)/$(SG3_UTILS_SOURCE) | $(TARGET_DIR) +sg3_utils: | $(TARGET_DIR) $(call autotools-package) for bin in $($(PKG)_BINARIES); do \ rm -f $(TARGET_bindir)/$$bin; \ @@ -1490,7 +1445,7 @@ LCD4LINUX_CONF_OPTS = \ lcd4linux: $(LCD4LINUX_DEPENDENCIES) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) - $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(GET_GIT_SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) $(CPDIR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ ./bootstrap; \ @@ -1512,7 +1467,7 @@ SAMSUNGLCD4LINUX_SITE = https://github.com/horsti58 samsunglcd4linux: | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) - $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(GET_GIT_SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) $(CPDIR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR)/ni; \ $(INSTALL) -m 0600 etc/lcd4linux.conf $(TARGET_sysconfdir); \ @@ -1564,7 +1519,7 @@ XUPNPD_MAKE_OPTS = \ xupnpd: $(XUPNPD_DEPENDENCIES) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) - $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(GET_GIT_SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) $(CPDIR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ git checkout $($(PKG)_CHECKOUT); \ @@ -1592,9 +1547,6 @@ NFS_UTILS_DIR = nfs-utils-$(NFS_UTILS_VERSION) NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz NFS_UTILS_SITE = $(KERNEL_MIRROR)/linux/utils/nfs-utils/$(NFS_UTILS_VERSION) -$(DL_DIR)/$(NFS_UTILS_SOURCE): - $(download) $(NFS_UTILS_SITE)/$(NFS_UTILS_SOURCE) - NFS_UTILS_DEPENDENCIES = rpcbind NFS_UTILS_AUTORECONF = YES @@ -1615,7 +1567,7 @@ NFS_UTILS_CONF_OPTS = \ --with-rpcgen=internal \ --without-systemd -nfs-utils: $(NFS_UTILS_DEPENDENCIES) $(DL_DIR)/$(NFS_UTILS_SOURCE) | $(TARGET_DIR) +nfs-utils: | $(TARGET_DIR) $(call autotools-package) chmod 0755 $(TARGET_base_sbindir)/mount.nfs rm -f $(addprefix $(TARGET_base_sbindir)/,mount.nfs4 osd_login umount.nfs umount.nfs4) @@ -1636,9 +1588,6 @@ RPCBIND_DIR = rpcbind-$(RPCBIND_VERSION) RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2 RPCBIND_SITE = https://sourceforge.net/projects/rpcbind/files/rpcbind/$(RPCBIND_VERSION) -$(DL_DIR)/$(RPCBIND_SOURCE): - $(download) $(RPCBIND_SITE)/$(RPCBIND_SOURCE) - RPCBIND_DEPENDENCIES = libtirpc RPCBIND_AUTORECONF = YES @@ -1648,7 +1597,7 @@ RPCBIND_CONF_OPTS = \ --with-rpcuser=root \ --with-systemdsystemunitdir=no -rpcbind: $(RPCBIND_DEPENDENCIES) $(DL_DIR)/$(RPCBIND_SOURCE) | $(TARGET_DIR) +rpcbind: | $(TARGET_DIR) $(call autotools-package) rm -rf $(TARGET_bindir)/rpcgen @@ -1721,9 +1670,6 @@ MC_DIR = mc-$(MC_VERSION) MC_SOURCE = mc-$(MC_VERSION).tar.xz MC_SITE = ftp.midnight-commander.org -$(DL_DIR)/$(MC_SOURCE): - $(download) $(MC_SITE)/$(MC_SOURCE) - MC_DEPENDENCIES = glib2 ncurses MC_AUTORECONF = YES @@ -1743,7 +1689,7 @@ MC_CONF_OPTS = \ --without-gpm-mouse \ --without-x -mc: $(MC_DEPENDENCIES) $(DL_DIR)/$(MC_SOURCE) | $(TARGET_DIR) +mc: | $(TARGET_DIR) $(call autotools-package) rm -rf $(TARGET_datadir)/mc/examples find $(TARGET_datadir)/mc/skins -type f ! -name default.ini | xargs --no-run-if-empty rm @@ -1755,9 +1701,6 @@ WGET_DIR = wget-$(WGET_VERSION) WGET_SOURCE = wget-$(WGET_VERSION).tar.gz WGET_SITE = $(GNU_MIRROR)/wget -$(DL_DIR)/$(WGET_SOURCE): - $(download) $(WGET_SITE)/$(WGET_SOURCE) - WGET_DEPENDENCIES = openssl WGET_CONF_OPTS = \ @@ -1768,7 +1711,7 @@ WGET_CONF_OPTS = \ --disable-debug \ CFLAGS="$(TARGET_CFLAGS) -DOPENSSL_NO_ENGINE" -wget: $(WGET_DEPENDENCIES) $(DL_DIR)/$(WGET_SOURCE) | $(TARGET_DIR) +wget: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -1802,7 +1745,7 @@ AIO_GRAB_CONF_OPTS = \ aio-grab: $(AIO_GRAB_DEPENDENCIES) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) - $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(GET_GIT_SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) $(CPDIR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ $(CONFIGURE); \ @@ -1823,7 +1766,7 @@ DVBSNOOP_CONF-OPTS = \ dvbsnoop: | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) - $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(GET_GIT_SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) $(CPDIR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ $(CONFIGURE); \ @@ -1848,7 +1791,7 @@ DVB_APPS_MAKE_OPTS = \ dvb-apps: $(DVB_APPS_DEPENDENCIES) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) - $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(GET_GIT_SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) $(CPDIR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ $(APPLY_PATCHES); \ @@ -1874,7 +1817,7 @@ MINISATIP_CONF_OPTS = \ minisatip: $(MINISATIP_DEPENDENCIES) | $(TARGET_DIR) $(REMOVE)/$(PKG_DIR) - $(GET-GIT-SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) + $(GET_GIT_SOURCE) $(PKG_SITE)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE) $(CPDIR)/$(PKG_SOURCE) $(CHDIR)/$(PKG_DIR); \ $(CONFIGURE); \ @@ -1897,15 +1840,12 @@ ETHTOOL_DIR = ethtool-$(ETHTOOL_VERSION) ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(KERNEL_MIRROR)/software/network/ethtool -$(DL_DIR)/$(ETHTOOL_SOURCE): - $(download) $(ETHTOOL_SITE)/$(ETHTOOL_SOURCE) - ETHTOOL_CONF_OPTS = \ --libdir=$(TARGET_libdir) \ --disable-pretty-dump \ --disable-netlink -ethtool: $(DL_DIR)/$(ETHTOOL_SOURCE) | $(TARGET_DIR) +ethtool: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -1942,9 +1882,6 @@ RSYNC_DIR = rsync-$(RSYNC_VERSION) RSYNC_SOURCE = rsync-$(RSYNC_VERSION).tar.gz RSYNC_SITE = https://download.samba.org/pub/rsync/src/ -$(DL_DIR)/$(RSYNC_SOURCE): - $(download) $(RSYNC_SITE)/$(RSYNC_SOURCE) - RSYNC_DEPENDENCIES = zlib popt RSYNC_CONF_OPTS = \ @@ -1954,7 +1891,7 @@ RSYNC_CONF_OPTS = \ --with-included-zlib=no \ --with-included-popt=no -rsync: $(RSYNC_DEPENDENCIES) $(DL_DIR)/$(RSYNC_SOURCE) | $(TARGET_DIR) +rsync: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- @@ -1964,9 +1901,6 @@ FLAC_DIR = flac-$(FLAC_VERSION) FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz FLAC_SITE = http://downloads.xiph.org/releases/flac -$(DL_DIR)/$(FLAC_SOURCE): - $(download) $(FLAC_SITE)/$(FLAC_SOURCE) - FLAC_AUTORECONF = YES FLAC_CONF_OPTS = \ @@ -1980,7 +1914,7 @@ FLAC_CONF_OPTS = \ --disable-ogg \ --disable-sse -flac: $(DL_DIR)/$(FLAC_SOURCE) | $(TARGET_DIR) +flac: | $(TARGET_DIR) $(call autotools-package) # ----------------------------------------------------------------------------- diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk index 1706df44..21b3727b 100644 --- a/package/crosstool-ng/crosstool-ng.mk +++ b/package/crosstool-ng/crosstool-ng.mk @@ -40,7 +40,7 @@ ifeq ($(wildcard $(CROSS_DIR)/build.log.bz2),) crosstool-ng: $(CROSSTOOL_NG_DEPS) | $(BUILD_DIR) $(REMOVE)/$($(PKG)_DIR) - $(GET-GIT-SOURCE) $($(PKG)_SITE)/$($(PKG)_SOURCE) $(DL_DIR)/$($(PKG)_SOURCE) + $(GET_GIT_SOURCE) $($(PKG)_SITE)/$($(PKG)_SOURCE) $(DL_DIR)/$($(PKG)_SOURCE) $(CPDIR)/$($(PKG)_SOURCE) ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2)) $(CHDIR)/$($(PKG)_DIR); \ diff --git a/package/ifenslave/ifenslave.mk b/package/ifenslave/ifenslave.mk index 446a4cef..058a4680 100644 --- a/package/ifenslave/ifenslave.mk +++ b/package/ifenslave/ifenslave.mk @@ -9,12 +9,9 @@ IFENSLAVE_DIR = ifenslave IFENSLAVE_SOURCE = ifenslave_$(IFENSLAVE_VERSION).tar.xz IFENSLAVE_SITE = http://snapshot.debian.org/archive/debian/20170102T091407Z/pool/main/i/ifenslave -$(DL_DIR)/$(IFENSLAVE_SOURCE): - $(download) $(IFENSLAVE_SITE)/$(IFENSLAVE_SOURCE) - -ifenslave: $(DL_DIR)/$(IFENSLAVE_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(PKG_DIR) - $(UNTAR)/$(PKG_SOURCE) +ifenslave: | $(TARGET_DIR) + $(call DOWNLOAD,$($(PKG)_SOURCE)) + $(call STARTUP) + $(call EXTRACT,$(BUILD_DIR)) $(INSTALL_EXEC) -D $(PKG_BUILD_DIR)/ifenslave $(TARGET_base_sbindir)/ifenslave - $(REMOVE)/$(PKG_DIR) - $(TOUCH) + $(call FOLLOWUP) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index c91c605d..57e2bfc3 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -5,15 +5,14 @@ ################################################################################ define autotools-package - $(REMOVE)/$($(PKG)_DIR) - $(UNTAR)/$($(PKG)_SOURCE) + $(call DEPENDENCIES) + $(call DOWNLOAD,$($(PKG)_SOURCE)) + $(call STARTUP) + $(call EXTRACT,$(BUILD_DIR)) $(CHDIR)/$($(PKG)_DIR); \ $(APPLY_PATCHES); \ $(CONFIGURE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REWRITE_CONFIG_SCRIPTS) - $(REWRITE_LIBTOOL) - $(REMOVE)/$($(PKG)_DIR) - $(TOUCH) + $(call FOLLOWUP) endef diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 27da86cd..81819161 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -5,16 +5,15 @@ ################################################################################ define cmake-package - $(REMOVE)/$($(PKG)_DIR) - $(UNTAR)/$($(PKG)_SOURCE) + $(call DEPENDENCIES) + $(call DOWNLOAD,$($(PKG)_SOURCE)) + $(call STARTUP) + $(call EXTRACT,$(BUILD_DIR)) $(CHDIR)/$($(PKG)_DIR); \ $(APPLY_PATCHES); \ $(CMAKE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) -rm -r $(TARGET_libdir)/cmake - $(REWRITE_CONFIG_SCRIPTS) - $(REWRITE_LIBTOOL) - $(REMOVE)/$($(PKG)_DIR) - $(TOUCH) + $(call FOLLOWUP) endef diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 4040aabc..be58ae06 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -9,9 +9,6 @@ SDL2_DIR = SDL2-$(SDL2_VERSION) SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release -$(DL_DIR)/$(SDL2_SOURCE): - $(download) $(SDL2_SITE)/$(SDL2_SOURCE) - SDL2_DEPENDENCIES = alsa-lib SDL2_CONFIG_SCRIPTS = sdl2-config @@ -37,6 +34,6 @@ SDL2_CONF_OPTS += \ --enable-video-opengles \ --without-x -sdl2: $(SDL2_DEPENDENCIES) $(DL_DIR)/$(SDL2_SOURCE) | $(TARGET_DIR) +sdl2: | $(TARGET_DIR) $(call autotools-package) -rm -r $(TARGET_libdir)/cmake