fixed C++11 dependency

This commit is contained in:
Marc Wäckerlin
2018-11-23 13:29:34 +00:00
parent e8d4a60511
commit f402e34c30
6 changed files with 58 additions and 41 deletions

View File

@@ -7,7 +7,7 @@ if test "${arch}" = "amd64"; then
myarch="amd64|i386"
fi
mode=
img="mwaeckerlin/ubuntu:latest"
img=
repos=()
keys=()
dns=()
@@ -81,24 +81,27 @@ while test $# -gt 0; do
echo
exit 0
;;
(-m|--mode) shift;
(-m|--mode)
shift;
mode="$1"
case "$mode" in
(deb|apt) img="mwaeckerlin/ubuntu:latest";;
(rpm|zypper) img="opensuse:latest";;
(yum) img="centos:latest";;
(dnf) img="fedora:latest";;
(win)
img="mwaeckerlin/ubuntu:latest"; host="${host:---host=i686-w64-mingw32}"
targets="all install"
flags+=("--prefix=/workdir/usr")
packages+=("mingw-w64")
;;
(*)
echo "**** ERROR: unknown mode '$1', try --help" 1>&2
exit 1
;;
esac
if test -z "$img"; then
case "$mode" in
(deb|apt) img="mwaeckerlin/debbuildenv";;
(rpm|zypper) img="opensuse:latest";;
(yum) img="centos:latest";;
(dnf) img="fedora:latest";;
(win)
img="mwaeckerlin/debbuildenv"; host="${host:---host=i686-w64-mingw32}"
targets="all install"
flags+=("--prefix=/workdir/usr")
packages+=("mingw-w64")
;;
(*)
echo "**** ERROR: unknown mode '$1', try --help" 1>&2
exit 1
;;
esac
fi
;;
(-i|--image) shift;
img="$1"
@@ -243,6 +246,9 @@ function ifthenelse() {
set -x
if test -z "$img"; then
img="mwaeckerlin/debbuildenv"
fi
docker pull $img
DOCKER_ID=$(docker create ${dns[@]} ${dirs[@]} ${envs[@]} -w /workdir $img sleep infinity)
trap 'traperror '"${DOCKER_ID}"' "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' SIGINT INT TERM EXIT
@@ -262,8 +268,8 @@ if test -z "$mode"; then
(*deb*) mode=deb;;
(*rpm*) mode=rpm;;
(*) case "$img" in
(*ubuntu*|*debian*|*mint*) mode=deb;;
(*fedora*|*centos*|*mageia*) mode=rpm;;
(*deb*|*ubuntu*|*debian*|*mint*) mode=deb;;
(*rpm*|*fedora*|*centos*|*mageia*) mode=rpm;;
(*mingw*|*win*) mode=win;;
(*) mode=deb;;
esac;;