summaryrefslogtreecommitdiff
path: root/makeopts.in
diff options
context:
space:
mode:
authorGeorge Joseph <gjoseph@digium.com>2016-11-16 11:05:43 -0700
committerGeorge Joseph <gjoseph@digium.com>2016-11-18 08:01:36 -0500
commitd3f070c7a26a79e1f02a745288c5b66e41324146 (patch)
treeebccaa676d53f374bb26c35c8eb47baf7c2bbfd6 /makeopts.in
parent98b3b500dc0da234b3e733dfc2a4b66be9339f1e (diff)
pjproject_bundled: Improve reliability of pjproject download
The download process now has a timeout which will cause wget to retry if it stops retrieving data for 5 seconds and fetch and curl to timeout if the whole retrieval take smore than 30 seconds. If the tarball retrieval works, the MD5SUM file is retrieved from the downloads site and the md5 checksum is verified. If either the tarball retrieval or MD5SUM retrieval fails, or the checksums don't match, the entire process is retried once. If it fails again, any incomplete tarball is deleted. .DELETE_ON_ERROR: was also added to the Makefile. Not only does this delete the tarball on failure, it till also delete corrupted library files from the pjproject source directory should they fail to build correctly. Tested all the way back to FreeBSD 9, CentOS 6, Debian 6 and Ubuntu 14. Change-Id: Iea7d33b96a31622ab1b6e54baebaf271959514e1
Diffstat (limited to 'makeopts.in')
-rw-r--r--makeopts.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/makeopts.in b/makeopts.in
index a145b02e6..c67e2f2b6 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -28,6 +28,7 @@ WGET=@WGET@
FETCH=@FETCH@
DOWNLOAD=@DOWNLOAD@
DOWNLOAD_TO_STDOUT=@DOWNLOAD_TO_STDOUT@
+DOWNLOAD_MAX_TIMEOUT=@DOWNLOAD_MAX_TIMEOUT@
SOUNDS_CACHE_DIR=@SOUNDS_CACHE_DIR@
EXTERNALS_CACHE_DIR=@EXTERNALS_CACHE_DIR@
RUBBER=@RUBBER@
@@ -46,6 +47,7 @@ TAR=@TAR@
PATCH=@PATCH@
SED=@SED@
NM=@NM@
+CAT=@CAT@
BUILD_PLATFORM=@BUILD_PLATFORM@
BUILD_CPU=@BUILD_CPU@