VladPolskiy/openstreetmap-mod_tile-python-implementation
1
0
Fork 0
mirror of https://github.com/openstreetmap/mod_tile.git synced 2025-07-28 23:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move MAPNIK_MAJOR_VERSION checks around (#439)

Browse Source
This commit is contained in:
Hummeltech
2024-06-04 20:04:09 -07:00
committed by GitHub
parent ba0d2af705
commit 1f81434203
5 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/centos/stream/Dockerfile
View File

@ -98,7 +98,7 @@ RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/
dnf --assumeyes install \
boost-devel \
cairo-devel \
cmake3 \
cmake \
gcc \
gcc-c++ \
gdal \

14
docker/centos/stream/Dockerfile.mapnik-latest
View File

@ -19,10 +19,10 @@ RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/
dnf --assumeyes install epel-release && \
dnf --assumeyes upgrade && \
dnf --assumeyes install \
boost1.78-devel \
boost-devel \
bzip2 \
cairo-devel \
cmake3 \
cmake \
freetype-devel \
gcc \
gcc-c++ \
@ -82,9 +82,9 @@ RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/
dnf --assumeyes install epel-release && \
dnf --assumeyes upgrade && \
dnf --assumeyes install \
boost1.78-devel \
boost-devel \
cairo-devel \
cmake3 \
cmake \
freetype-devel \
gcc \
gcc-c++ \
@ -104,6 +104,7 @@ RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/
libxml2-devel \
make \
pkg-config \
procps \
proj-devel
## Copy files from builder(s)
@ -116,7 +117,6 @@ WORKDIR /tmp/mod_tile_build
RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \
cmake -B . -S /tmp/mod_tile_src \
-DCMAKE_BUILD_TYPE:STRING=Release \
-DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES:PATH=/usr/include/boost1.78 \
-DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var \
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \
@ -145,9 +145,7 @@ RUN --mount=id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/
dnf --assumeyes install epel-release && \
dnf --assumeyes upgrade && \
dnf --assumeyes install \
boost1.78-filesystem \
boost1.78-program-options \
boost1.78-regex \
boost-regex \
cairo \
gdal \
harfbuzz \