temporary postgis 3.5.0beta1 build workaround

postgis · Sep 17, 2024 · 9c2f517 · 9c2f517
1 parent 75ed703
commit 9c2f517
Show file tree

Hide file tree

Showing 23 changed files with 95 additions and 33 deletions.
diff --git a/12-3.5/alpine3.19/Dockerfile b/12-3.5/alpine3.19/Dockerfile
diff --git a/12-3.5/alpine3.20/Dockerfile b/12-3.5/alpine3.20/Dockerfile
diff --git a/13-3.5/alpine3.19/Dockerfile b/13-3.5/alpine3.19/Dockerfile
diff --git a/13-3.5/alpine3.20/Dockerfile b/13-3.5/alpine3.20/Dockerfile
diff --git a/14-3.5/alpine3.19/Dockerfile b/14-3.5/alpine3.19/Dockerfile
diff --git a/14-3.5/alpine3.20/Dockerfile b/14-3.5/alpine3.20/Dockerfile
diff --git a/14-l3.1.9gcp/bookworm/Dockerfile b/14-l3.1.9gcp/bookworm/Dockerfile
diff --git a/15-3.5/alpine3.19/Dockerfile b/15-3.5/alpine3.19/Dockerfile
diff --git a/15-3.5/alpine3.20/Dockerfile b/15-3.5/alpine3.20/Dockerfile
diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile
diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile
diff --git a/16-3.5/alpine3.19/Dockerfile b/16-3.5/alpine3.19/Dockerfile
diff --git a/16-3.5/alpine3.20/Dockerfile b/16-3.5/alpine3.20/Dockerfile
diff --git a/16-l3.5.0beta1/bookworm/Dockerfile b/16-l3.5.0beta1/bookworm/Dockerfile
diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile
diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile
diff --git a/17rc1-3.5/alpine3.19/Dockerfile b/17rc1-3.5/alpine3.19/Dockerfile
diff --git a/17rc1-3.5/alpine3.20/Dockerfile b/17rc1-3.5/alpine3.20/Dockerfile
diff --git a/17rc1-l3.5.0beta1/bookworm/Dockerfile b/17rc1-l3.5.0beta1/bookworm/Dockerfile
diff --git a/17rc1-master/bookworm/Dockerfile b/17rc1-master/bookworm/Dockerfile
diff --git a/17rc1-recent/bookworm/Dockerfile b/17rc1-recent/bookworm/Dockerfile
diff --git a/Dockerfile.alpine.template b/Dockerfile.alpine.template
@@ -83,7 +83,12 @@ RUN set -eux \
     && su postgres -c 'pg_ctl -D /tempdb init' \
     && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \
     && cd regress \
+{{ if .[env.variant].POSTGIS_CHECKOUT == "tags/3.5.0beta1" then ( -}}
+    # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779
+    && make -j1 check RUNTESTFLAGS=--extension PGUSER=postgres \
+{{ ) else ( -}}
     && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \
+{{ ) end -}}
     \
     && su postgres -c 'psql    -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \
     && su postgres -c 'psql    -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \

diff --git a/Dockerfile.master.template b/Dockerfile.master.template
@@ -103,7 +103,9 @@ RUN set -eux \
       liblz4-dev \
       liblzma-dev \
       libwebp-dev \
-      libzstd-dev
+      libzstd-dev \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
 ARG PGIS1_CMAKE_BUILD_TYPE
 ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE}
@@ -328,7 +330,9 @@ RUN set -eux \
       libopenjp2-7-dev \
       libpng-dev \
       libqhull-dev \
-      libspatialite-dev
+      libspatialite-dev \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 {{ ) else ( -}}
 #
 {{ ) end -}}
@@ -653,7 +657,12 @@ RUN set -eux \
 # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie
     && ./configure \
         --enable-lto \
+{{ if .[env.variant].POSTGIS_CHECKOUT == "tags/3.5.0beta1" then ( -}}
+    # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779
+    && make -j1 \
+{{ ) else ( -}}
     && make -j$(nproc) \
+{{ ) end -}}
     && make install \
 # refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316
     && if command -v projsync >/dev/null 2>&1; then \