diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-11-23 12:54:15 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-11-27 22:40:25 +0100 |
| commit | df50d2dcfeb382a051528e4f64bad4c0b8fe83f8 (patch) | |
| tree | 2a900ccfecd126aa7670963b4584737d863026e6 /Makefile.fetch | |
| parent | cb3fc7ff18545412827cb017818890eda7e2f564 (diff) | |
download few tarballs directly without md5sum in name
..and add few fixes, like:
* use 'set -o pipefail' to fail meaningfully
* include download.lst at the end of config_host.mk
* MOZ_ZIP_* do not have md5sum, do not check for it
Change-Id: I23759aa2f5fdd55b662588fdb0a31568a686aef7
Diffstat (limited to 'Makefile.fetch')
| -rw-r--r-- | Makefile.fetch | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index eb0e35d5db5e..3da38c69560d 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -35,16 +35,31 @@ fetch_Download__checksum_command := endif -define fetch_Download_item +# fetch__Download_item url tarball-name md5sum +define fetch__Download_item $(if $(wildcard $(TARFILE_LOCATION)/$2),, \ cd $(TARFILE_LOCATION)/tmp \ +&& set -o pipefail \ $(call fetch_Download__wget_command,$1,$2) \ -$(call fetch_Download__checksum_command,$2,$(firstword $(subst -, ,$2))) \ +$(if $3,$(call fetch_Download__checksum_command,$2,$3)) \ && mv $2 ../ \ ) endef +# fetch_Download_item url tarball-name no-sum? +define fetch_Download_item +$(call fetch__Download_item,$1,$2,$(if $3,,$(firstword $(subst -, ,$2)))) + +endef + +# fetch_Download_item_special url variable-name +define fetch_Download_item_special +$(if $($(subst _TARBALL,_MD5SUM,$(2))),,$(error "fetch_Download_item_special: $2_MD5SUM can't be empty")) +$(call fetch__Download_item,$1,$($2),$($(subst _TARBALL,_MD5SUM,$(2)))) + +endef + fetch_BUILD_TYPE := $(sort $(BUILD_TYPE)) ifeq ($(CROSS_COMPILING),YES) fetch_BUILD_TYPE := $(sort $(fetch_BUILD_TYPE) $(shell . $(SRCDIR)/bin/get_config_variables --build BUILD_TYPE && echo $$BUILD_TYPE)) @@ -56,6 +71,11 @@ endef fetch : $(foreach item, \ + $(call fetch_Optional,CDR,CDR_TARBALL) \ + $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ + $(call fetch_Optional,VISIO,VISIO_TARBALL) \ + ,$(call fetch_Download_item_special,http://dev-www.libreoffice.org/src,$(item))) + $(foreach item, \ 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz \ 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz \ c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz \ @@ -68,7 +88,6 @@ fetch : $(call fetch_Optional,BOOST,$(BOOST_TARBALL)) \ $(call fetch_Optional,BSH,$(BSH_TARBALL)) \ $(call fetch_Optional,CAIRO,$(CAIRO_TARBALL)) \ - $(call fetch_Optional,CDR,$(CDR_TARBALL)) \ $(call fetch_Optional,CLUCENE,$(CLUCENE_TARBALL)) \ $(call fetch_Optional,CMIS,$(CMIS_TARBALL)) \ $(call fetch_Optional,CPPUNIT,$(CPPUNIT_TARBALL)) \ @@ -116,7 +135,6 @@ fetch : $(call fetch_Optional,LPSOLVE,$(LPSOLVE_TARBALL)) \ $(call fetch_Optional,MDDS,$(MDDS_TARBALL)) \ $(call fetch_Optional,MOZ,$(MOZ_TARBALL)) \ - $(call fetch_Optional,MSPUB,$(MSPUB_TARBALL)) \ $(call fetch_Optional,MYSQLCPPCONN,$(MYSQLCPPCONN_TARBALL)) \ $(call fetch_Optional,MYTHES,$(MYTHES_TARBALL)) \ $(call fetch_Optional,NEON,$(NEON_TARBALL)) \ @@ -136,7 +154,6 @@ fetch : $(call fetch_Optional,TOMCAT,$(TOMCAT_TARBALL)) \ $(call fetch_Optional,UCPP,$(UCPP_TARBALL)) \ $(call fetch_Optional,VIGRA,$(VIGRA_TARBALL)) \ - $(call fetch_Optional,VISIO,$(VISIO_TARBALL)) \ $(call fetch_Optional,WPD,$(WPD_TARBALL)) \ $(call fetch_Optional,WPG,$(WPG_TARBALL)) \ $(call fetch_Optional,WPS,$(WPS_TARBALL)) \ @@ -173,6 +190,6 @@ fetch : $(call fetch_Optional,MOZ,$(MOZ_ZIP_INC)) \ $(call fetch_Optional,MOZ,$(MOZ_ZIP_LIB)) \ $(call fetch_Optional,MOZ,$(MOZ_ZIP_RUNTIME)) \ - ,$(call fetch_Download_item,http://dev-www.libreoffice.org/mozilla,$(item))) + ,$(call fetch_Download_item,http://dev-www.libreoffice.org/mozilla,$(item),no-sum)) # vim: set noet sw=4 ts=4: |