From 38251e00e1353d8cba348e3c22c7f20d72e7614e Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Fri, 11 Aug 2023 12:15:41 -0400
Subject: ci: update to v7 of the GCC p1689r5 patches

---
 .gitlab/ci/docker/gcc_cxx_modules/install_gcc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab/ci/docker/gcc_cxx_modules/install_gcc.sh b/.gitlab/ci/docker/gcc_cxx_modules/install_gcc.sh
index 20ea35f..529626e 100755
--- a/.gitlab/ci/docker/gcc_cxx_modules/install_gcc.sh
+++ b/.gitlab/ci/docker/gcc_cxx_modules/install_gcc.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-readonly revision="p1689r5-cmake-ci-20220614" # 3075e510e3d29583f8886b95aff044c0474c84a5
+readonly revision="p1689r5-cmake-ci-20230814" # 9fd54ccc390ab4eb3c48186b7bf15e02632cc76c
 readonly tarball="https://github.com/mathstuf/gcc/archive/$revision.tar.gz"
 
 readonly workdir="$HOME/gcc"
-- 
cgit v0.12


From 945c4b1771a251483fcc1141dfb8f44850623d7c Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Sat, 12 Aug 2023 10:49:13 -0400
Subject: ci: update to Fedora 38 for GCC C++ module container

---
 .gitlab/ci/docker/gcc_cxx_modules/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab/ci/docker/gcc_cxx_modules/Dockerfile b/.gitlab/ci/docker/gcc_cxx_modules/Dockerfile
index e0af0b9..d8e8238 100644
--- a/.gitlab/ci/docker/gcc_cxx_modules/Dockerfile
+++ b/.gitlab/ci/docker/gcc_cxx_modules/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:36
+FROM fedora:38
 MAINTAINER Ben Boeckel <ben.boeckel@kitware.com>
 
 # Install build dependencies for packages.
-- 
cgit v0.12


From 0d837ba0f04311c94ad6e443f91e455ed2f4d22f Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Fri, 11 Aug 2023 12:16:59 -0400
Subject: ci: update gcc module rules file for new flag spellings

---
 .gitlab/ci/cxx_modules_rules_gcc.cmake | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/.gitlab/ci/cxx_modules_rules_gcc.cmake b/.gitlab/ci/cxx_modules_rules_gcc.cmake
index 3777506..3726f6d 100644
--- a/.gitlab/ci/cxx_modules_rules_gcc.cmake
+++ b/.gitlab/ci/cxx_modules_rules_gcc.cmake
@@ -3,7 +3,17 @@ set(CMake_TEST_CXXModules_UUID "a246741c-d067-4019-a8fb-3d16b0c9d1d3")
 string(CONCAT CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE
   "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E -x c++ <SOURCE>"
   " -MT <DYNDEP_FILE> -MD -MF <DEP_FILE>"
-  " -fmodules-ts -fdep-file=<DYNDEP_FILE> -fdep-output=<OBJECT> -fdep-format=trtbd"
+  " -fmodules-ts -fdeps-file=<DYNDEP_FILE> -fdeps-target=<OBJECT> -fdeps-format=p1689r5"
   " -o <PREPROCESSED_SOURCE>")
 set(CMAKE_EXPERIMENTAL_CXX_MODULE_MAP_FORMAT "gcc")
-set(CMAKE_EXPERIMENTAL_CXX_MODULE_MAP_FLAG "-fmodules-ts -fmodule-mapper=<MODULE_MAP_FILE> -fdep-format=trtbd -x c++")
+string(CONCAT CMAKE_EXPERIMENTAL_CXX_MODULE_MAP_FLAG
+  # Turn on modules.
+  "-fmodules-ts"
+  # Read the module mapper file.
+  " -fmodule-mapper=<MODULE_MAP_FILE>"
+  # Make sure dependency tracking is enabled (missing from `try_*`).
+  " -MD"
+  # Suppress `CXX_MODULES +=` from generated depfile snippets.
+  " -fdeps-format=p1689r5"
+  # Force C++ as a language.
+  " -x c++")
-- 
cgit v0.12


From 6d359ce7a0dd55c1935eed7d25c381e3794ebb48 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Sat, 12 Aug 2023 06:32:33 -0400
Subject: gitlab-ci: use the new GCC C++ modules build container

---
 .gitlab/os-linux.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 3b2a494..a6d35e1 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -376,7 +376,7 @@
 ### C++ modules
 
 .gcc_cxx_modules_x86_64:
-    image: "kitware/cmake:ci-gcc_cxx_modules-x86_64-2022-06-21"
+    image: "kitware/cmake:ci-gcc_cxx_modules-x86_64-2023-08-15"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
-- 
cgit v0.12