Skip to content

Commit e165257

Browse files
committed
fix qmake command and add ccache to i686 image
1 parent 3d074be commit e165257

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

docker/manylinux2014/Dockerfile_i686

+7
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,13 @@ RUN cd ~/ffmpeg_sources && \
4949
ldconfig && \
5050
rm -rf ~/ffmpeg_sources
5151

52+
RUN curl -O -L https://github.com/ccache/ccache/releases/download/v3.7.9/ccache-3.7.9.tar.gz && \
53+
tar -xf ccache-3.7.9.tar.gz && \
54+
cd ccache-3.7.9 && \
55+
linux32 ./configure && \
56+
make -j$(getconf _NPROCESSORS_ONLN) && \
57+
make install
58+
5259
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/root/ffmpeg_build/lib/pkgconfig
5360
ENV LDFLAGS -L/root/ffmpeg_build/lib
5461
ENV PATH "$HOME/bin:$PATH"

travis_config.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ function pre_build {
104104
export PATH="/usr/local/opt/qt/bin:$PATH"
105105
fi
106106

107+
qmake -query
108+
107109
echo 'Installing FFmpeg'
108110

109111
if [ -n "$CACHE_STAGE" ]; then
@@ -123,8 +125,8 @@ function pre_build {
123125

124126
else
125127
echo "Running for linux"
128+
qmake-qt5 -query
126129
fi
127-
qmake -query
128130
}
129131

130132
function run_tests {

0 commit comments

Comments
 (0)