partial fix

This commit is contained in:
2021-11-13 11:32:32 -05:00
parent 33767626c1
commit 34ec38d1a9
4 changed files with 298 additions and 15 deletions

View File

@@ -9,8 +9,8 @@ RUN apt update && apt install -y gcc-7 g++-7 && update-alternatives --install /u
RUN apt install -y pkg-config python3 yasm ragel \
automake autotools-dev wget libtool libssl-dev \
curl zip unzip tar xorg-dev libglu1-mesa-dev libxcursor-dev \
libxml2-dev libxinerama-dev gettext \
nasm git \
libxml2-dev libxinerama-dev gettext bison \
nasm git meson\
&& apt clean
# cmake
@@ -19,14 +19,14 @@ RUN wget https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2
tar -xzf cmake-*.tar.gz && cd cmake-* && ./bootstrap && make -j33 && make install && rm -rf /cmake-*
# vcpkg
RUN git clone https://github.com/microsoft/vcpkg.git
RUN cd vcpkg && ./bootstrap-vcpkg.sh
RUN git clone https://github.com/microsoft/vcpkg.git && cd vcpkg && git checkout 897ff93
ADD patches/* /
RUN patch -p0 < mupdf-curl-dep.patch
RUN patch -p0 < mongoose-master.patch
RUN cd /vcpkg/ && ./bootstrap-vcpkg.sh
RUN ./vcpkg/vcpkg install \
curl[core,openssl] \
&& rm -rf /root/.cache/vcpkg /vcpkg/downloads /vcpkg/buildtrees /vcpkg/downloads
@@ -35,3 +35,9 @@ RUN ./vcpkg/vcpkg install \
lmdb cjson glib brotli libarchive[core,bzip2,libxml2,lz4,lzma,lzo] pthread tesseract libxml2 libmupdf gtest mongoose libmagic libraw jasper lcms gumbo \
&& rm -rf /root/.cache/vcpkg /vcpkg/downloads /vcpkg/buildtrees /vcpkg/downloads
RUN mkdir -p /debug/lib/ && mkdir -p /include && \
cp -r /vcpkg/installed/x64-linux/include/cjson/ /include/ && \
cp /vcpkg/installed/x64-linux/debug/lib/libcjson.a /debug/lib/ && \
cp /vcpkg/installed/x64-linux/lib/libcjson.a /lib/