har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: simplify TMPDIR setting

Browse Source 
Originally committed as revision 16385 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2008-12-29 12:55:24 +00:00
parent 91535e5f38
commit a49d42c24e
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
configure vendored
View File

@ -1278,20 +1278,15 @@ enabled cross_compile || host_cc_default=$cc
set_default host_cc set_default host_cc
# set temporary file name # set temporary file name
if test ! -z "$TMPDIR" ; then : ${TMPDIR:=$TEMPDIR}
TMPDIR1="${TMPDIR}" : ${TMPDIR:=/tmp}
elif test ! -z "$TEMPDIR" ; then
TMPDIR1="${TEMPDIR}"
else
TMPDIR1="/tmp"
fi
TMPC="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.c" TMPC="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.c"
TMPE="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}${EXESUF}" TMPE="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}${EXESUF}"
TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h" TMPH="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
TMPO="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o" TMPO="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o"
TMPS="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S" TMPS="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S"
TMPSH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.sh" TMPSH="${TMPDIR}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.sh"
check_cflags -std=c99 check_cflags -std=c99
@ -1690,9 +1685,8 @@ EOF
chmod +x $TMPSH >> $logfile 2>&1 chmod +x $TMPSH >> $logfile 2>&1
if ! $TMPSH >> $logfile 2>&1; then if ! $TMPSH >> $logfile 2>&1; then
cat <<EOF cat <<EOF
Unable to create and execute files in $TMPDIR1. Set the TMPDIR environment Unable to create and execute files in $TMPDIR. Set the TMPDIR environment
variable to another directory and make sure that $TMPDIR1 is not mounted variable to another directory and make sure that it is not mounted noexec.
noexec.
EOF EOF
die "Sanity test failed." die "Sanity test failed."
fi fi