提交 e165257d 编写于 作者: O Olli-Pekka Heinisuo

fix qmake command and add ccache to i686 image

上级 3d074beb
...@@ -49,6 +49,13 @@ RUN cd ~/ffmpeg_sources && \ ...@@ -49,6 +49,13 @@ RUN cd ~/ffmpeg_sources && \
ldconfig && \ ldconfig && \
rm -rf ~/ffmpeg_sources rm -rf ~/ffmpeg_sources
RUN curl -O -L https://github.com/ccache/ccache/releases/download/v3.7.9/ccache-3.7.9.tar.gz && \
tar -xf ccache-3.7.9.tar.gz && \
cd ccache-3.7.9 && \
linux32 ./configure && \
make -j$(getconf _NPROCESSORS_ONLN) && \
make install
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/root/ffmpeg_build/lib/pkgconfig ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/root/ffmpeg_build/lib/pkgconfig
ENV LDFLAGS -L/root/ffmpeg_build/lib ENV LDFLAGS -L/root/ffmpeg_build/lib
ENV PATH "$HOME/bin:$PATH" ENV PATH "$HOME/bin:$PATH"
...@@ -104,6 +104,8 @@ function pre_build { ...@@ -104,6 +104,8 @@ function pre_build {
export PATH="/usr/local/opt/qt/bin:$PATH" export PATH="/usr/local/opt/qt/bin:$PATH"
fi fi
qmake -query
echo 'Installing FFmpeg' echo 'Installing FFmpeg'
if [ -n "$CACHE_STAGE" ]; then if [ -n "$CACHE_STAGE" ]; then
...@@ -123,8 +125,8 @@ function pre_build { ...@@ -123,8 +125,8 @@ function pre_build {
else else
echo "Running for linux" echo "Running for linux"
qmake-qt5 -query
fi fi
qmake -query
} }
function run_tests { function run_tests {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册