Merge pull request #3032 from bestlong/fix-3017
fix build error for PHP-FPM Audiowaveform
This commit is contained in:
commit
aca0b9b15c
@ -990,19 +990,17 @@ ARG INSTALL_AUDIOWAVEFORM=false
|
|||||||
|
|
||||||
RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \
|
RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \
|
||||||
apt-get -y install wget make cmake gcc g++ libmad0-dev libid3tag0-dev libsndfile1-dev libgd-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev \
|
apt-get -y install wget make cmake gcc g++ libmad0-dev libid3tag0-dev libsndfile1-dev libgd-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev \
|
||||||
|
&& cd /tmp \
|
||||||
&& git clone https://github.com/bbc/audiowaveform.git \
|
&& git clone https://github.com/bbc/audiowaveform.git \
|
||||||
&& cd audiowaveform \
|
&& cd audiowaveform \
|
||||||
&& wget https://github.com/google/googletest/archive/release-1.10.0.tar.gz \
|
&& git clone --depth=1 https://github.com/google/googletest.git -b release-1.11.0 \
|
||||||
&& tar xzf release-1.10.0.tar.gz \
|
|
||||||
&& ln -s googletest-release-1.10.0/googletest googletest \
|
|
||||||
&& ln -s googletest-release-1.10.0/googlemock googlemock \
|
|
||||||
&& mkdir build \
|
&& mkdir build \
|
||||||
&& cd build \
|
&& cd build \
|
||||||
&& cmake .. \
|
&& cmake .. \
|
||||||
&& make \
|
&& make \
|
||||||
&& make install \
|
&& make install \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
|
|
||||||
#####################################
|
#####################################
|
||||||
# wkhtmltopdf:
|
# wkhtmltopdf:
|
||||||
|
Loading…
Reference in New Issue
Block a user