Skip to content

Commit

Permalink
Corrected flags and improved Dockerfile.
Browse files Browse the repository at this point in the history
  • Loading branch information
dlemstra committed Jul 15, 2023
1 parent 078be2e commit cd16a44
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM ubuntu:22.04

RUN apt-get update && \
apt-get install -y autoconf autopoint binutils clang cmake gettext git gperf libc++-dev libc++abi-dev libtool make nasm pkg-config po4a
apt-get install -y autoconf autopoint binutils clang cmake gettext git gperf libc++-dev libc++abi-dev libtool locales make nasm pkg-config po4a && \
locale-gen en_US.UTF-8

RUN mkdir -p mkdir /ImageMagick6/dependencies
WORKDIR /ImageMagick6/dependencies
Expand All @@ -21,8 +22,7 @@ RUN git clone --depth 1 https://github.com/freetype/freetype
RUN git clone --depth 1 https://gitlab.com/federicomenaquintero/bzip2.git
RUN git -c http.sslVerify=false clone https://www.cl.cam.ac.uk/~mgk25/git/jbigkit

RUN curl https://raw.githubusercontent.com/ImageMagick/ImageMagick6/main/.devcontainer/build_dependencies.sh -o build_dependencies.sh && \
chmod +x build_dependencies.sh
ADD build_dependencies.sh build_dependencies.sh

ENV SRC=/ImageMagick6/dependencies
ENV WORK=/ImageMagick6
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/build_imagemagick.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash -eu

autoreconf -fiv
./configure --prefix="$WORK" --disable-docs CFLAGS="-I$WORK/include" LIBS="-L$WORK/lib" PKG_CONFIG_PATH="$WORK/lib/pkgconfig"
./configure --prefix="$WORK" --disable-shared --disable-docs CFLAGS="$CFLAGS -I$WORK/include" LIBS="-L$WORK/lib -lde265 -stdlib=libc++" PKG_CONFIG_PATH="$WORK/lib/pkgconfig"
make "-j$(nproc)"
make install

Expand Down

0 comments on commit cd16a44

Please # to comment.