Skip to content

Commit ccab455

Browse files
author
Clement Champetier
committed
Travis: fixed build on OSX
'mktemp -d' command needs a template argument on OSX (not mandatory on linux).
1 parent e9cd5e1 commit ccab455

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

‎tools/travis/linux.install.deps.sh

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
1515

1616
# yasm
1717
echo "Building YASM (${YASM_VERSION})"
18-
DIR=$(mktemp -d) && cd ${DIR} && \
18+
DIR=$(mktemp -d yasmXXX) && cd ${DIR} && \
1919
curl -Os http://www.tortall.net/projects/yasm/releases/yasm-${YASM_VERSION}.tar.gz && \
2020
tar xzf yasm-${YASM_VERSION}.tar.gz && \
2121
cd yasm-${YASM_VERSION} && \
@@ -27,7 +27,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
2727
# x264
2828
echo ""
2929
echo "Building x264 (last version)"
30-
DIR=$(mktemp -d) && cd ${DIR} && \
30+
DIR=$(mktemp -d x264XXX) && cd ${DIR} && \
3131
git clone --depth 1 git://git.videolan.org/x264 && \
3232
cd x264 && \
3333
./configure --prefix="$DEPENDENCY_INSTALL_PATH" --bindir="${DEPENDENCY_INSTALL_PATH}/bin" --enable-shared --disable-asm && \
@@ -38,7 +38,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
3838
# libmp3lame
3939
echo ""
4040
echo "Building libmp3lame (${LAME_VERSION})"
41-
DIR=$(mktemp -d) && cd ${DIR} && \
41+
DIR=$(mktemp -d libmp3lameXXX) && cd ${DIR} && \
4242
curl -L -Os http://downloads.sourceforge.net/project/lame/lame/${LAME_VERSION%.*}/lame-${LAME_VERSION}.tar.gz && \
4343
tar xzf lame-${LAME_VERSION}.tar.gz && \
4444
cd lame-${LAME_VERSION} && \
@@ -53,7 +53,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
5353
# http://sourceforge.net/p/faac/bugs/162/#46a0
5454
echo ""
5555
echo "Building faac (${FAAC_VERSION})"
56-
DIR=$(mktemp -d) && cd ${DIR} && \
56+
DIR=$(mktemp -d faacXXX) && cd ${DIR} && \
5757
curl -L -Os http://downloads.sourceforge.net/faac/faac-${FAAC_VERSION}.tar.gz && \
5858
tar xzf faac-${FAAC_VERSION}.tar.gz && \
5959
cd faac-${FAAC_VERSION} && \
@@ -67,7 +67,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
6767
# xvid
6868
echo ""
6969
echo "Building xvid (${XVID_VERSION})"
70-
DIR=$(mktemp -d) && cd ${DIR} && \
70+
DIR=$(mktemp -d xvidXXX) && cd ${DIR} && \
7171
curl -L -Os http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \
7272
tar xzf xvidcore-${XVID_VERSION}.tar.gz && \
7373
cd xvidcore/build/generic && \
@@ -81,7 +81,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
8181
# Warning: need automake + libtool
8282
echo ""
8383
echo "Building fdk-aac (${FDKAAC_VERSION})"
84-
DIR=$(mktemp -d) && cd ${DIR} && \
84+
DIR=$(mktemp -d fdk-aacXXX) && cd ${DIR} && \
8585
curl -s https://codeload.github.com/mstorsjo/fdk-aac/tar.gz/v${FDKAAC_VERSION} | tar zxf - && \
8686
cd fdk-aac-${FDKAAC_VERSION} && \
8787
autoreconf -fiv && \
@@ -93,7 +93,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
9393
# libogg
9494
echo ""
9595
echo "Building libogg (${OGG_VERSION})"
96-
DIR=$(mktemp -d) && cd ${DIR} && \
96+
DIR=$(mktemp -d liboggXXX) && cd ${DIR} && \
9797
curl -O http://downloads.xiph.org/releases/ogg/libogg-${OGG_VERSION}.tar.gz && \
9898
tar xzf libogg-${OGG_VERSION}.tar.gz && \
9999
cd libogg-${OGG_VERSION} && \
@@ -105,7 +105,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
105105
# libvorbis
106106
echo ""
107107
echo "Building libvorbis (${VORBIS_VERSION})"
108-
DIR=$(mktemp -d) && cd ${DIR} && \
108+
DIR=$(mktemp -d libvorbisXXX) && cd ${DIR} && \
109109
curl -O http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS_VERSION}.tar.gz && \
110110
tar xzf libvorbis-${VORBIS_VERSION}.tar.gz && \
111111
cd libvorbis-${VORBIS_VERSION} && \
@@ -118,7 +118,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
118118
# https://trac.ffmpeg.org/ticket/4956
119119
echo ""
120120
echo "Building libvpx (${VPX_VERSION})"
121-
DIR=$(mktemp -d) && cd ${DIR} && \
121+
DIR=$(mktemp -d libvpxXXX) && cd ${DIR} && \
122122
git clone https://github.com/webmproject/libvpx.git && \
123123
cd libvpx && \
124124
git checkout v${VPX_VERSION} && \
@@ -130,11 +130,11 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
130130
# libopus
131131
echo ""
132132
echo "Building libopus (last version)"
133-
DIR=$(mktemp -d) && cd ${DIR} && \
133+
DIR=$(mktemp -d libopusXXX) && cd ${DIR} && \
134134
git clone git://git.opus-codec.org/opus.git && \
135135
cd opus && \
136136
autoreconf -fiv && \
137-
./configure --prefix="${DEPENDENCY_INSTALL_PATH}" --enable-shared --with-pic && \
137+
./configure --prefix="${DEPENDENCY_INSTALL_PATH}" --enable-shared --with-pic
138138
make -k > ${DEPENDENCY_LOG_FILE} 2>&1 && \
139139
make install && \
140140
rm -rf ${DIR}
@@ -149,7 +149,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
149149

150150
echo ""
151151
echo "Building ffmpeg (${DEPENDENCY_VERSION})"
152-
DIR=$(mktemp -d) && cd ${DIR} && \
152+
DIR=$(mktemp -d ffmpegXXX) && cd ${DIR} && \
153153
curl -Os http://ffmpeg.org/releases/ffmpeg-${DEPENDENCY_VERSION}.tar.gz && \
154154
tar xzf ffmpeg-${DEPENDENCY_VERSION}.tar.gz && \
155155
cd ffmpeg-${DEPENDENCY_VERSION} && \
@@ -167,7 +167,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
167167

168168
echo ""
169169
echo "Building libav (${DEPENDENCY_VERSION})"
170-
DIR=$(mktemp -d) && cd ${DIR} && \
170+
DIR=$(mktemp -d libavXXX) && cd ${DIR} && \
171171
curl -Os https://libav.org/releases/libav-${DEPENDENCY_VERSION}.tar.gz && \
172172
tar xzf libav-${DEPENDENCY_VERSION}.tar.gz && \
173173
cd libav-${DEPENDENCY_VERSION} && \

0 commit comments

Comments
 (0)