1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

Merge commit '78489822074096e3ae0f3c3b70accace955086f6'

* commit '78489822074096e3ae0f3c3b70accace955086f6':
  configure: Place all temporary files in one separate directory

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch
2017-05-20 16:44:58 +02:00

16
configure vendored
View File

@@ -3771,19 +3771,23 @@ elif ! check_cmd mktemp -u XXXXXX; then
# simple replacement for missing mktemp # simple replacement for missing mktemp
# NOT SAFE FOR GENERAL USE # NOT SAFE FOR GENERAL USE
mktemp(){ mktemp(){
echo "${2%%XXX*}.${HOSTNAME}.${UID}.$$" tmpname="${2%%XXX*}.${HOSTNAME}.${UID}.$$"
echo "$tmpname"
mkdir "$tmpname"
} }
fi fi
FFTMPDIR=$(mktemp -d "${TMPDIR}/ffconf.XXXXXXXX" 2> /dev/null) ||
die "Unable to create temporary directory in $TMPDIR."
tmpfile(){ tmpfile(){
tmp=$(mktemp -u "${TMPDIR}/ffconf.XXXXXXXX")$2 && tmp="${FFTMPDIR}/test"$2
(set -C; exec > $tmp) 2>/dev/null || (set -C; exec > $tmp) 2> /dev/null ||
die "Unable to create temporary file in $TMPDIR." die "Unable to create temporary file in $FFTMPDIR."
append TMPFILES $tmp
eval $1=$tmp eval $1=$tmp
} }
trap 'rm -f -- $TMPFILES' EXIT trap 'rm -rf -- "$FFTMPDIR"' EXIT
tmpfile TMPASM .asm tmpfile TMPASM .asm
tmpfile TMPC .c tmpfile TMPC .c