There is a mistake in the cmGeneratorTarget_cxx patch (Surely from me).
This creates a wrong scope. "this->IsFrameworkOnApple()" is present
twice and the first one adds a wrong bracket which creates a scope to
the end of the whole function. THIS IS WRONG.
Maybe this triggers our random issues with cmake, maybe not but this
should go in?
Rafael
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.185
diff -u -p -u -p -r1.185 Makefile
--- Makefile 26 May 2020 15:15:09 -0000 1.185
+++ Makefile 12 Sep 2020 08:01:09 -0000
@@ -8,7 +8,7 @@ VER = 3.17.2
EPOCH = 0
DISTNAME = cmake-${VER}
CATEGORIES = devel
-REVISION = 0
+REVISION = 1
HOMEPAGE = https://www.cmake.org/
Index: patches/patch-Source_cmGeneratorTarget_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 patch-Source_cmGeneratorTarget_cxx
--- patches/patch-Source_cmGeneratorTarget_cxx 25 May 2020 05:12:00 -0000
1.13
+++ patches/patch-Source_cmGeneratorTarget_cxx 12 Sep 2020 08:01:09 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-Source_cmGeneratorTarget
Index: Source/cmGeneratorTarget.cxx
--- Source/cmGeneratorTarget.cxx.orig
+++ Source/cmGeneratorTarget.cxx
-@@ -4154,9 +4154,16 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
+@@ -4154,9 +4154,15 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
// Check for library version properties.
const char* version = this->GetProperty("VERSION");
const char* soversion = this->GetProperty("SOVERSION");
@@ -13,14 +13,14 @@ Index: Source/cmGeneratorTarget.cxx
+#else
if (!this->HasSOName(config) ||
this->Makefile->IsOn("CMAKE_PLATFORM_NO_VERSIONED_SONAME") ||
- this->IsFrameworkOnApple()) {
+- this->IsFrameworkOnApple()) {
+ this->IsFrameworkOnApple())
+#endif
+ {
// Versioning is supported only for shared libraries and modules,
// and then only when the platform supports an soname flag.
version = nullptr;
-@@ -4180,6 +4187,35 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
+@@ -4180,6 +4186,35 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
// The library name.
targetNames.Output = prefix + targetNames.Base + suffix;
