On Sun Apr 25, 2021 at 06:54:51AM +0200, Rafael Sadowski wrote:
> Update CMake to 3.20.1 with some notable port changes.
>
> - Set CMAKE_SUPPRESS_REGENERATION to ON
> https://cmake.org/cmake/help/latest/variable/CMAKE_SUPPRESS_REGENERATION.html
>
> This is a massive improvement for our bulk builders. Let me explain.
> If something change during the build-task in
> /usr/local/share/cmake/Modules/ (For example, another package was
> installed), cmake starts a second configure tasks after the build
> task. In this second task our (self hacked) SHARED_LIBS VERSION's are
> lost. Whit CMAKE_SUPPRESS_REGENERATION=ON this not happen, proved by
> two amd64 bulk builds.
>
> - Remove cmLocaleRAII patch. This is no longer necessary. The class now
> copies the value of LC_CTYPE and not hold a pointer.
>
>
> I had only positive experiences with this diff. Feedback, concerns, OK?
>
> More bulk build tests welcome. All consumers should be fixed.
>
> Rafael
>
Bump to cmake 3.20.2.
https://blog.kitware.com/cmake-3-20-2-available-for-download/
This is in a bulk build if it passed the bulk and I see no concerns form
you I'll commit it.
Rafael
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 28aa3712782..01a38f9b5d2 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -4,9 +4,8 @@ DPB_PROPERTIES = parallel
COMMENT = portable build system
-VER = 3.19.4
+VER = 3.20.2
EPOCH = 0
-REVISION = 0
DISTNAME = cmake-${VER}
CATEGORIES = devel
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index dc75d907a03..f0f511e6bab 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.19.4.tar.gz) = fQIyufHFfo3oHzgHHvggPmgg/n7siuRqHfEl2I28wuE=
-SIZE (cmake-3.19.4.tar.gz) = 9266976
+SHA256 (cmake-3.20.2.tar.gz) = rs9uy5dRees7tqSlDK4ZLUHpK5NysCMA+ejx1fVZVE4=
+SIZE (cmake-3.20.2.tar.gz) = 9438694
diff --git a/devel/cmake/patches/patch-Modules_FindOpenMP_cmake b/devel/cmake/patches/patch-Modules_FindOpenMP_cmake
index 9760275d89c..8093cc0cbc8 100644
--- a/devel/cmake/patches/patch-Modules_FindOpenMP_cmake
+++ b/devel/cmake/patches/patch-Modules_FindOpenMP_cmake
@@ -5,7 +5,7 @@ Add libs and paths. Ensure the lib is used for the C case.
Index: Modules/FindOpenMP.cmake
--- Modules/FindOpenMP.cmake.orig
+++ Modules/FindOpenMP.cmake
-@@ -95,8 +95,8 @@ function(_OPENMP_FLAG_CANDIDATES LANG)
+@@ -101,8 +101,8 @@ function(_OPENMP_FLAG_CANDIDATES LANG)
if(NOT OpenMP_${LANG}_FLAG)
unset(OpenMP_FLAG_CANDIDATES)
diff --git a/devel/cmake/patches/patch-Modules_FindQt3_cmake b/devel/cmake/patches/patch-Modules_FindQt3_cmake
index c16aa53e8a0..173680aba4d 100644
--- a/devel/cmake/patches/patch-Modules_FindQt3_cmake
+++ b/devel/cmake/patches/patch-Modules_FindQt3_cmake
@@ -2,7 +2,7 @@ $OpenBSD: patch-Modules_FindQt3_cmake,v 1.12 2019/08/21 05:47:40 rsadowski Exp $
Index: Modules/FindQt3.cmake
--- Modules/FindQt3.cmake.orig
+++ Modules/FindQt3.cmake
-@@ -140,7 +140,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
+@@ -142,7 +142,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
# Qt 3 should prefer QTDIR over the PATH
find_program(QT_MOC_EXECUTABLE
@@ -11,7 +11,7 @@ Index: Modules/FindQt3.cmake
HINTS
ENV QTDIR
PATHS
-@@ -160,7 +160,7 @@ endif()
+@@ -162,7 +162,7 @@ endif()
# Qt 3 should prefer QTDIR over the PATH
find_program(QT_UIC_EXECUTABLE
diff --git a/devel/cmake/patches/patch-Modules_FindSDL_cmake b/devel/cmake/patches/patch-Modules_FindSDL_cmake
index dda30799846..0ad33e97370 100644
--- a/devel/cmake/patches/patch-Modules_FindSDL_cmake
+++ b/devel/cmake/patches/patch-Modules_FindSDL_cmake
@@ -2,7 +2,7 @@ $OpenBSD: patch-Modules_FindSDL_cmake,v 1.12 2021/02/12 17:36:49 rsadowski Exp $
Index: Modules/FindSDL.cmake
--- Modules/FindSDL.cmake.orig
+++ Modules/FindSDL.cmake
-@@ -116,6 +116,11 @@ else()
+@@ -124,6 +124,11 @@ else()
set(VC_LIB_PATH_SUFFIX lib/x86)
endif()
diff --git a/devel/cmake/patches/patch-Source_cmArchiveWrite_cxx b/devel/cmake/patches/patch-Source_cmArchiveWrite_cxx
index 5f47faafef2..bc07a33b9ad 100644
--- a/devel/cmake/patches/patch-Source_cmArchiveWrite_cxx
+++ b/devel/cmake/patches/patch-Source_cmArchiveWrite_cxx
@@ -29,7 +29,7 @@ the invalid use of the interface.
Index: Source/cmArchiveWrite.cxx
--- Source/cmArchiveWrite.cxx.orig
+++ Source/cmArchiveWrite.cxx
-@@ -283,9 +283,6 @@ bool cmArchiveWrite::AddFile(const char* file, size_t
+@@ -297,9 +297,6 @@ bool cmArchiveWrite::AddFile(const char* file, size_t
}
const char* out = file + skip;
diff --git a/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx b/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx
index 0ab29c480c0..fcf3f2cbe3b 100644
--- a/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx
+++ b/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx
@@ -13,7 +13,7 @@ Index: Source/cmComputeLinkInformation.cxx
this->OrderRuntimeSearchPath->SetImplicitDirectories(this->ImplicitLinkDirs);
if (this->OrderDependentRPath) {
this->OrderDependentRPath->SetImplicitDirectories(this->ImplicitLinkDirs);
-@@ -482,6 +483,7 @@ cmComputeLinkInformation::GetSharedLibrariesLinked() c
+@@ -488,6 +489,7 @@ cmComputeLinkInformation::GetSharedLibrariesLinked() c
bool cmComputeLinkInformation::Compute()
{
@@ -21,7 +21,7 @@ Index: Source/cmComputeLinkInformation.cxx
// Skip targets that do not link.
if (!(this->Target->GetType() == cmStateEnums::EXECUTABLE ||
this->Target->GetType() == cmStateEnums::SHARED_LIBRARY ||
-@@ -508,10 +510,17 @@ bool cmComputeLinkInformation::Compute()
+@@ -514,10 +516,17 @@ bool cmComputeLinkInformation::Compute()
if (linkEntry.IsSharedDep) {
this->AddSharedDepItem(linkEntry.Item, linkEntry.Target);
} else {
@@ -39,9 +39,9 @@ Index: Source/cmComputeLinkInformation.cxx
// Restore the target link type so the correct system runtime
// libraries are found.
cmProp lss = this->Target->GetProperty("LINK_SEARCH_END_STATIC");
-@@ -703,10 +712,16 @@ void cmComputeLinkInformation::AddItem(BT<std::string>
+@@ -713,10 +722,16 @@ void cmComputeLinkInformation::AddItem(BT<std::string>
// This is a directory.
- this->AddDirectoryItem(item.Value);
+ this->DropDirectoryItem(item.Value);
} else {
- // Use the full path given to the library file.
this->Depends.push_back(item.Value);
@@ -59,7 +59,7 @@ Index: Source/cmComputeLinkInformation.cxx
}
} else {
// This is a library or option specified by the user.
-@@ -1036,11 +1051,18 @@ void cmComputeLinkInformation::AddTargetItem(BT<std::s
+@@ -1049,11 +1064,18 @@ void cmComputeLinkInformation::AddTargetItem(BT<std::s
this->SharedLibrariesLinked.insert(target);
}
@@ -82,7 +82,7 @@ Index: Source/cmComputeLinkInformation.cxx
}
// For compatibility with CMake 2.4 include the item's directory in
-@@ -1053,6 +1075,27 @@ void cmComputeLinkInformation::AddTargetItem(BT<std::s
+@@ -1066,6 +1088,27 @@ void cmComputeLinkInformation::AddTargetItem(BT<std::s
// Now add the full path to the library.
this->Items.emplace_back(item, true, target);
diff --git a/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx b/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx
index 06dfe4baabc..f1f9001281a 100644
--- a/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx
+++ b/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx
@@ -3,7 +3,7 @@ $OpenBSD: patch-Source_cmGeneratorTarget_cxx,v 1.15 2020/12/30 07:17:34 rsadowsk
Index: Source/cmGeneratorTarget.cxx
--- Source/cmGeneratorTarget.cxx.orig
+++ Source/cmGeneratorTarget.cxx
-@@ -4774,9 +4774,14 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
+@@ -4810,9 +4810,14 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
// Check for library version properties.
cmProp version = this->GetProperty("VERSION");
cmProp soversion = this->GetProperty("SOVERSION");
@@ -18,7 +18,7 @@ Index: Source/cmGeneratorTarget.cxx
// Versioning is supported only for shared libraries and modules,
// and then only when the platform supports an soname flag.
version = nullptr;
-@@ -4800,6 +4805,36 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
+@@ -4836,6 +4841,36 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
// The library name.
targetNames.Output = prefix + targetNames.Base + suffix;
diff --git a/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx b/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx
index 0c4516761d6..cef8f4ef9cf 100644
--- a/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx
+++ b/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx
@@ -3,7 +3,7 @@ $OpenBSD: patch-Source_cmGlobalGenerator_cxx,v 1.15 2020/12/30 07:17:34 rsadowsk
Index: Source/cmGlobalGenerator.cxx
--- Source/cmGlobalGenerator.cxx.orig
+++ Source/cmGlobalGenerator.cxx
-@@ -2589,6 +2589,9 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
+@@ -2601,6 +2601,9 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
cmCustomCommandLine singleLine;
singleLine.push_back(cmSystemTools::GetCTestCommand());
singleLine.push_back("--force-new-ctest-process");
diff --git a/devel/cmake/patches/patch-Source_cmInstallCommand_cxx b/devel/cmake/patches/patch-Source_cmInstallCommand_cxx
index 00dea48b162..a8a504fac83 100644
--- a/devel/cmake/patches/patch-Source_cmInstallCommand_cxx
+++ b/devel/cmake/patches/patch-Source_cmInstallCommand_cxx
@@ -2,7 +2,7 @@ $OpenBSD: patch-Source_cmInstallCommand_cxx,v 1.17 2020/05/25 05:12:00 rsadowski
Index: Source/cmInstallCommand.cxx
--- Source/cmInstallCommand.cxx.orig
+++ Source/cmInstallCommand.cxx
-@@ -380,6 +380,9 @@ bool HandleTargetsMode(std::vector<std::string> const&
+@@ -393,6 +393,9 @@ bool HandleTargetsMode(std::vector<std::string> const&
}
// Select the mode for installing symlinks to versioned shared libraries.
@@ -12,7 +12,7 @@ Index: Source/cmInstallCommand.cxx
cmInstallTargetGenerator::NamelinkModeType namelinkMode =
cmInstallTargetGenerator::NamelinkModeNone;
if (libraryArgs.GetNamelinkOnly()) {
-@@ -387,6 +390,10 @@ bool HandleTargetsMode(std::vector<std::string> const&
+@@ -400,6 +403,10 @@ bool HandleTargetsMode(std::vector<std::string> const&
} else if (libraryArgs.GetNamelinkSkip()) {
namelinkMode = cmInstallTargetGenerator::NamelinkModeSkip;
}
diff --git a/devel/cmake/patches/patch-Source_cmInstallTargetGenerator_cxx b/devel/cmake/patches/patch-Source_cmInstallTargetGenerator_cxx
index bc67fa33112..7d5dbf811b9 100644
--- a/devel/cmake/patches/patch-Source_cmInstallTargetGenerator_cxx
+++ b/devel/cmake/patches/patch-Source_cmInstallTargetGenerator_cxx
@@ -3,7 +3,7 @@ $OpenBSD: patch-Source_cmInstallTargetGenerator_cxx,v 1.2 2020/12/30 07:17:34 rs
Index: Source/cmInstallTargetGenerator.cxx
--- Source/cmInstallTargetGenerator.cxx.orig
+++ Source/cmInstallTargetGenerator.cxx
-@@ -796,6 +796,11 @@ void cmInstallTargetGenerator::AddStripRule(std::ostre
+@@ -813,6 +813,11 @@ void cmInstallTargetGenerator::AddStripRule(std::ostre
return;
}
diff --git a/devel/cmake/patches/patch-Source_cmLoadCommandCommand_cxx b/devel/cmake/patches/patch-Source_cmLoadCommandCommand_cxx
deleted file mode 100644
index 029a62bf489..00000000000
--- a/devel/cmake/patches/patch-Source_cmLoadCommandCommand_cxx
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-Source_cmLoadCommandCommand_cxx,v 1.1 2020/12/30 07:17:34 rsadowski Exp $
-
-Index: Source/cmLoadCommandCommand.cxx
---- Source/cmLoadCommandCommand.cxx.orig
-+++ Source/cmLoadCommandCommand.cxx
-@@ -1,11 +1,11 @@
- /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
- file Copyright.txt or https://cmake.org/licensing for details. */
-
--#if !defined(_WIN32) && !defined(__sun)
-+#if !defined(_WIN32) && !defined(__sun) && !defined(__OpenBSD__)
- // POSIX APIs are needed
- # define _POSIX_C_SOURCE 200809L
-
No comments:
Post a Comment