From 852d9260470a859af76805e7e9e8e531f187e2fa Mon Sep 17 00:00:00 2001 From: Sim Sun Date: Tue, 14 Nov 2023 01:46:09 -0800 Subject: [PATCH] use curl to instead of wget in makefile --- projects/buck2/build.mk | 2 +- projects/cmake/build.mk | 2 +- projects/elfutils/build.mk | 2 +- projects/licenses.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/buck2/build.mk b/projects/buck2/build.mk index 8d273fc..489aa5e 100644 --- a/projects/buck2/build.mk +++ b/projects/buck2/build.mk @@ -24,7 +24,7 @@ $(HOST_OUT_DIR)/bin/buck2: $(DOWNLOADS_DIR)/$(BUCK2_ARCHIVE) | $(HOST_OUT_DIR) $(DOWNLOADS_DIR)/$(BUCK2_ARCHIVE): | $(DOWNLOADS_DIR) # instructions to download the archive - wget -q -O $@ $(BUCK2_URL) + curl -L -s -o $@ $(BUCK2_URL) # Phony target for host .PHONY: buck2-host diff --git a/projects/cmake/build.mk b/projects/cmake/build.mk index de08e4c..e5a9e49 100644 --- a/projects/cmake/build.mk +++ b/projects/cmake/build.mk @@ -13,7 +13,7 @@ $(CMAKE_HOST_BUILD_DIR): CMAKE_VERSION = 3.22.2 CMAKE_URL = https://github.com/Kitware/CMake/releases/download/v$(CMAKE_VERSION)/cmake-$(CMAKE_VERSION).tar.gz $(DOWNLOADS_DIR)/cmake-$(CMAKE_VERSION).tar.gz: | $(DOWNLOADS_DIR) - cd $(DOWNLOADS_DIR) && wget $(CMAKE_URL) + cd $(DOWNLOADS_DIR) && curl -L -O $(CMAKE_URL) projects/cmake/sources: $(DOWNLOADS_DIR)/cmake-$(CMAKE_VERSION).tar.gz -mkdir $@ diff --git a/projects/elfutils/build.mk b/projects/elfutils/build.mk index 18589f2..915304d 100644 --- a/projects/elfutils/build.mk +++ b/projects/elfutils/build.mk @@ -26,7 +26,7 @@ $(ANDROID_BUILD_DIR)/elfutils: $(ANDROID_OUT_DIR)/lib/pkgconfig/zlib.pc ELFUTILS_VERSION = 0.186 ELFUTILS_URL = http://sourceware.org/pub/elfutils/$(ELFUTILS_VERSION)/elfutils-$(ELFUTILS_VERSION).tar.bz2 projects/elfutils/sources: | $(DOWNLOADS_DIR) - wget $(ELFUTILS_URL) -O $(DOWNLOADS_DIR)/elfutils-$(ELFUTILS_VERSION).tar.bz2 + curl -L $(ELFUTILS_URL) -o $(DOWNLOADS_DIR)/elfutils-$(ELFUTILS_VERSION).tar.bz2 -mkdir $@ tar xf $(DOWNLOADS_DIR)/elfutils-$(ELFUTILS_VERSION).tar.bz2 -C $@ \ --transform="s|^elfutils-$(ELFUTILS_VERSION)||" diff --git a/projects/licenses.mk b/projects/licenses.mk index 40b8d0e..cc7e750 100644 --- a/projects/licenses.mk +++ b/projects/licenses.mk @@ -4,4 +4,4 @@ LGPL_URL := https://www.gnu.org/licenses/lgpl-3.0.txt -fetch-license = wget $($(2)_URL) -O $(ANDROID_OUT_DIR)/licenses/$(1) +fetch-license = curl -L $($(2)_URL) -o $(ANDROID_OUT_DIR)/licenses/$(1)