Skip to content

Commit cd16a44

Browse files
committed
Corrected flags and improved Dockerfile.
1 parent 078be2e commit cd16a44

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.devcontainer/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
FROM ubuntu:22.04
22

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

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

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

2727
ENV SRC=/ImageMagick6/dependencies
2828
ENV WORK=/ImageMagick6

.devcontainer/build_imagemagick.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash -eu
22

33
autoreconf -fiv
4-
./configure --prefix="$WORK" --disable-docs CFLAGS="-I$WORK/include" LIBS="-L$WORK/lib" PKG_CONFIG_PATH="$WORK/lib/pkgconfig"
4+
./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"
55
make "-j$(nproc)"
66
make install
77

0 commit comments

Comments
 (0)