From 08a16ce7bddcd6368df04a20e7c604942ecf6b02 Mon Sep 17 00:00:00 2001 From: "Garth N. Wells" Date: Thu, 24 Nov 2022 14:09:16 +0000 Subject: [PATCH] Workaround in Dockerfile for PETSc gcc/clang issue in complex mode. See https://gitlab.com/petsc/petsc/-/issues/1288. --- docker/Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 9e6439b0e11..677b7d1d43c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -92,6 +92,9 @@ ARG PETSC_SLEPC_OPTFLAGS="-O2" # Turn on PETSc and SLEPc debugging. "yes" or "no". ARG PETSC_SLEPC_DEBUGGING="no" +# See https://gitlab.com/petsc/petsc/-/issues/1288 +ARG PETSC_CPPFLAGS="-Dlogq=foobar" + # MPI variant. "mpich" or "openmpi". ARG MPI="mpich" # See https://github.com/pmodels/mpich/issues/5811 @@ -243,6 +246,7 @@ RUN apt-get -qq update && \ # Real, 32-bit int python3 ./configure \ PETSC_ARCH=linux-gnu-real-32 \ + --CPPFLAGS="${PETSC_CPPFLAGS}" \ --COPTFLAGS="${PETSC_SLEPC_OPTFLAGS}" \ --CXXOPTFLAGS="${PETSC_SLEPC_OPTFLAGS}" \ --FOPTFLAGS="${PETSC_SLEPC_OPTFLAGS}" \ @@ -264,6 +268,7 @@ RUN apt-get -qq update && \ # Complex, 32-bit int python3 ./configure \ PETSC_ARCH=linux-gnu-complex-32 \ + --CPPFLAGS="${PETSC_CPPFLAGS}" \ --COPTFLAGS="${PETSC_SLEPC_OPTFLAGS}" \ --CXXOPTFLAGS="${PETSC_SLEPC_OPTFLAGS}" \ --FOPTFLAGS="${PETSC_SLEPC_OPTFLAGS}" \ @@ -284,6 +289,7 @@ RUN apt-get -qq update && \ # Real, 64-bit int python3 ./configure \ PETSC_ARCH=linux-gnu-real-64 \ + --CPPFLAGS="${PETSC_CPPFLAGS}" \ --COPTFLAGS="${PETSC_SLEPC_OPTFLAGS}" \ --CXXOPTFLAGS="${PETSC_SLEPC_OPTFLAGS}" \ --FOPTFLAGS="${PETSC_SLEPC_OPTFLAGS}" \ @@ -302,6 +308,7 @@ RUN apt-get -qq update && \ # Complex, 64-bit int python3 ./configure \ PETSC_ARCH=linux-gnu-complex-64 \ + --CPPFLAGS="${PETSC_CPPFLAGS}" \ --COPTFLAGS="${PETSC_SLEPC_OPTFLAGS}" \ --CXXOPTFLAGS="${PETSC_SLEPC_OPTFLAGS}" \ --FOPTFLAGS="${PETSC_SLEPC_OPTFLAGS}" \