diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2019-01-19 14:38:21 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2019-01-19 15:28:07 +0000 |
| commit | d279a98da1aae886a4b4201122ce5614a185f008 (patch) | |
| tree | 0800eca320fced59a554b02507cc009c555407f3 /subr/build_init.subr | |
| parent | e402f659b8e40a27d6ce64ea1a8f08be9f28c848 (diff) | |
| download | midipix_build-d279a98da1aae886a4b4201122ce5614a185f008.tar.bz2 midipix_build-d279a98da1aae886a4b4201122ce5614a185f008.tar.xz | |
etc/build.usage, subr/build_{args,checks}.subr: merges -c into -C as -C prefix.
etc/build.usage, subr/build_{args,init}.subr: merges -[46N] into -F as ipv4|ipv6|offline.
subr/ex_rtl_fetch.subr: honour ${{ARG_FETCH_FORCE,DEFAULT_GIT_ARGS}}.
subr/pkg_install_strip.subr: correctly strip non-release build binaries.
subr/pkg_install_strip.subr:pkg_install_strip(): honour ${ARG_DEBUG_MINIPIX}.
vars/env.vars, subr/pkg_fetch_{download,git,wget}.subr: merges fetch_{git,wget} into fetch_download.
vars/midipix.vars: adds ${DEFAULT_GIT_ARGS}.
vars/{musl,python[23]{,_host}}.vars: updated concerning fetch_download.
Diffstat (limited to 'subr/build_init.subr')
| -rw-r--r-- | subr/build_init.subr | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/subr/build_init.subr b/subr/build_init.subr index 34fa6b68..c7ec7d4f 100644 --- a/subr/build_init.subr +++ b/subr/build_init.subr @@ -40,9 +40,11 @@ build_init() { exit 0; fi; export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; - if [ ${ARG_IPV4_ONLY:-0} -eq 1 ]; then + if [ "${ARG_FETCH_FORCE}" = "ipv4" ]; then + DEFAULT_GIT_ARGS="-4${DEFAULT_GIT_ARGS:+ ${DEFAULT_GIT_ARGS}}"; DEFAULT_WGET_ARGS="-4${DEFAULT_WGET_ARGS:+ ${DEFAULT_WGET_ARGS}}"; - elif [ ${ARG_IPV6_ONLY:-0} -eq 1 ]; then + elif [ "${ARG_FETCH_FORCE}" = "ipv6" ]; then + DEFAULT_GIT_ARGS="-6${DEFAULT_GIT_ARGS:+ ${DEFAULT_GIT_ARGS}}"; DEFAULT_WGET_ARGS="-6${DEFAULT_WGET_ARGS:+ ${DEFAULT_WGET_ARGS}}"; fi; _env_vars="$(export | sed -e 's/^export //' -e 's/=.*$//')"; |