From 03a6372afeb96419da89a8100c95366f9ebe68cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?=
 =?UTF-8?q?p=29?= <l.illanes@gmx.de>
Date: Wed, 1 Feb 2017 00:35:43 +0000
Subject: subr/{pkg,pkg_fetch}.subr: merges fetch{,_git}() into pkg_fetch.subr
 and introduces ${PKG_URLS_GIT}. subr/pkg_extract.subr: only extract if
 ${PKG_URL} is set. var/build.vars: updated to use ${PKG_URLS_GIT}.
 vars/{cparser,gcc,libfirm,musl,perl}.vars: updated to call pkg_fetch()
 instead of fetch{,_git}(). vars/gcc.vars: cleanup pkgp_gcc_setup_env() and
 pkg_gcc_stage1_all().

---
 subr/pkg.subr | 58 ++++++++++------------------------------------------------
 1 file changed, 10 insertions(+), 48 deletions(-)

(limited to 'subr/pkg.subr')

diff --git a/subr/pkg.subr b/subr/pkg.subr
index da36f35e..2130feb5 100644
--- a/subr/pkg.subr
+++ b/subr/pkg.subr
@@ -3,59 +3,20 @@
 # See warning at the top of build.vars.
 #
 
-# N.B.	URLs ($1) may contain `?' or '&' characters.
-fetch() {
-	_f_url="${1}"; _f_sha256sum_src="${2}";
-	_f_url_dst="${DLCACHEDIR}/$(basename "${_f_url}")";
-	if [ ${ARG_OFFLINE:-0} -eq 1 ]\
-	|| [ -e ${_f_url_dst}.fetched ]; then
-		unset _f_url _f_sha256sum_src _f_url_dst;
-		return 0;
-	else
-		wget ${WGET_ARGS} -c -O ${_f_url_dst} "${_f_url}";
-	fi;
-	if [ -n "${_f_sha256sum_src}" ]; then
-		set -- $(openssl dgst -sha256 ${_f_url_dst}); shift $((${#}-1));
-		if [ "${_f_sha256sum_dst:=${1}}" != "${_f_sha256sum_src}" ]; then
-			if [ ${ARG_IGNORE_SHA256SUMS:-0} -eq 0 ]; then
-				log_msg failexit "Error: hash mismatch for URL \`${_f_url}' (is: ${_f_sha256sum_dst}, should be: ${_f_sha256sum_src}.)";
-			else
-				log_msg warn "Warning: hash mismatch for URL \`${_f_url}' (is: ${_f_sha256sum_dst}, should be: ${_f_sha256sum_src}.)";
-			fi;
-		fi;
-	fi;
-	touch ${_f_url_dst}.fetched;
-	unset _f_url _f_url_dst _f_sha256sum_src _f_sha256sum_dst;
-};
-
-fetch_git() {
-	_fg_subdir="${1}"; _fg_url="${2}"; _fg_branch="${3}";
-	if [ ${ARG_OFFLINE:-0} -eq 0 ]; then
-		if [ -e "${DLCACHEDIR}/${_fg_subdir}" ]; then
-			cd ${DLCACHEDIR}/${_fg_subdir} &&\
-				git pull origin ${_fg_branch:-main} && cd ${OLDPWD};
+is_build_script_done() {
+	if [ "${1}" = "clean" ]; then
+		if match_list "${ARG_RESTART}" , ${BUILD_PACKAGE_LC}	\
+		&& [ -n "${ARG_RESTART_AT}" ]				\
+		&& match_list "${ARG_RESTART_AT}" , "${1}"; then
+			return 1;		# Build
 		else
-			git clone ${_fg_url} ${DLCACHEDIR}/${_fg_subdir};
-			if [ -n "${_fg_branch}" -a		\
-			     \( -z "${_fg_branch#main}" \) -a	\
-			     \( -z "${_fg_branch#master}" \) ]; then
-				cd ${DLCACHEDIR}/${_fg_subdir} &&\
-					git checkout -b ${_fg_branch} && cd ${OLDPWD};
-			fi;
+			return 0;		# Skip
 		fi;
-	fi;
-	secure_rm ${_fg_subdir};
-	cp -pr ${DLCACHEDIR}/${_fg_subdir} .;
-};
-
-is_build_script_done() {
-	if [ "${1}" != "clean" ]\
-	&& [ "${ARG_RESTART}" = "ALL" ]; then
+	elif [ "${ARG_RESTART}" = "ALL" ]; then
 		return 1;			# Build
 	elif match_list "${ARG_RESTART}" , ${BUILD_PACKAGE_LC}; then
 		if [ -n "${ARG_RESTART_AT}" ]; then
-			if [ "${1}" != "clean" ]\
-			&& [ "${ARG_RESTART_AT}" = "ALL" ]; then
+			if [ "${ARG_RESTART_AT}" = "ALL" ]; then
 				return 1;	# Build
 			elif match_list "${ARG_RESTART_AT}" , "${1}"; then
 				return 1;	# Build
@@ -93,6 +54,7 @@ parse_with_pkg_name() {
 	PKG_NAME=${1}; shift;
 	_pwpn_pkg_name_uc=$(echo ${PKG_NAME} | tr a-z A-Z);
 	if [ -z "$(get_var_unsafe PKG_${_pwpn_pkg_name_uc}_URL)" ]\
+	&& [ -z "$(get_var_unsafe PKG_${_pwpn_pkg_name_uc}_URLS_GIT)" ]\
 	&& [ -z "$(get_var_unsafe PKG_${_pwpn_pkg_name_uc}_VERSION)" ]; then
 		unset _pwpn_pkg_name_uc;
 		log_msg failexit "Error: package \`${PKG_NAME}' missing in build.vars.";
-- 
cgit v1.2.3