- add 53d523f2e11839bcbbdc9288b4f71c764d0efd5c.diff to fix automoc

race

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=455

53d523f2e11839bcbbdc9288b4f71c764d0efd5c.diff

@@ -0,0 +1,47 @@
+diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx
+index 535f786f41487e57fd3e9d547d22344b18b924a1..f5831628d3fe3c05b0bf4447036e5ac6bcdbdafc 100644
+--- a/Source/cmQtAutoMocUic.cxx
++++ b/Source/cmQtAutoMocUic.cxx
+@@ -564,8 +564,7 @@ private:
+   // -- Generation
+   bool CreateDirectories();
+   // -- Support for depfiles
+-  static std::vector<std::string> dependenciesFromDepFile(
+-    const char* filePath);
++  std::vector<std::string> dependenciesFromDepFile(const char* filePath);
+ 
+   // -- Settings
+   BaseSettingsT BaseConst_;
+@@ -2066,7 +2065,8 @@ void cmQtAutoMocUicT::JobCompileMocT::Process()
+                             " does not exist.");
+       return;
+     }
+-    this->CacheEntry->Moc.Depends = dependenciesFromDepFile(depfile.c_str());
++    this->CacheEntry->Moc.Depends =
++      this->Gen()->dependenciesFromDepFile(depfile.c_str());
+   }
+ }
+ 
+@@ -2223,12 +2223,12 @@ void cmQtAutoMocUicT::JobDepFilesMergeT::Process()
+                this->MessagePath(this->BaseConst().DepFile.c_str())));
+   }
+   auto processDepFile =
+-    [](const std::string& mocOutputFile) -> std::vector<std::string> {
++    [this](const std::string& mocOutputFile) -> std::vector<std::string> {
+     std::string f = mocOutputFile + ".d";
+     if (!cmSystemTools::FileExists(f)) {
+       return {};
+     }
+-    return dependenciesFromDepFile(f.c_str());
++    return this->Gen()->dependenciesFromDepFile(f.c_str());
+   };
+ 
+   std::vector<std::string> dependencies = this->initialDependencies();
+@@ -2961,6 +2961,7 @@ bool cmQtAutoMocUicT::CreateDirectories()
+ std::vector<std::string> cmQtAutoMocUicT::dependenciesFromDepFile(
+   const char* filePath)
+ {
++  std::lock_guard<std::mutex> guard(this->CMakeLibMutex_);
+   auto const content = cmReadGccDepfile(filePath);
+   if (!content || content->empty()) {
+     return {};

cmake.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 29 07:33:25 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- add 53d523f2e11839bcbbdc9288b4f71c764d0efd5c.diff to fix automoc
+  race 
+
 -------------------------------------------------------------------
 Fri Apr  9 16:10:18 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
 

cmake.spec

@@ -55,6 +55,8 @@ Patch0:         cmake-fix-ruby-test.patch
 # Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice
 Patch1:         feature-suse-python-interp-search-order.patch
 Patch2:         cmake-fix-png-include-dir.patch
+# From https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6008
+Patch3:         53d523f2e11839bcbbdc9288b4f71c764d0efd5c.diff
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig