From cd16a443b0418a41b5a3611cece12b9d5c7cf6e7 Mon Sep 17 00:00:00 2001 From: Dirk Lemstra Date: Sat, 15 Jul 2023 16:49:06 +0200 Subject: [PATCH] Corrected flags and improved Dockerfile. --- .devcontainer/Dockerfile | 6 +++--- .devcontainer/build_imagemagick.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 5df574bec..a6596c764 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -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 @@ -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 diff --git a/.devcontainer/build_imagemagick.sh b/.devcontainer/build_imagemagick.sh index f64dc6c7e..17772aa44 100755 --- a/.devcontainer/build_imagemagick.sh +++ b/.devcontainer/build_imagemagick.sh @@ -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