CVS commit: pkgsrc/devel/cmake

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Sep 10 14:40:02 UTC 2025

Modified Files:
        pkgsrc/devel/cmake: Makefile distinfo
        pkgsrc/devel/cmake/patches: patch-Modules_Compiler_GNU.cmake

Log Message:
cmake: Do not use LTO on SunOS.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.232 -r1.233 pkgsrc/devel/cmake/Makefile
cvs rdiff -u -r1.255 -r1.256 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/cmake/patches/patch-Modules_Compiler_GNU.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/cmake/Makefile
diff -u pkgsrc/devel/cmake/Makefile:1.232 pkgsrc/devel/cmake/Makefile:1.233
--- pkgsrc/devel/cmake/Makefile:1.232   Mon Sep  1 08:25:16 2025
+++ pkgsrc/devel/cmake/Makefile Wed Sep 10 14:40:02 2025
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.232 2025/09/01 08:25:16 adam Exp $
+# $NetBSD: Makefile,v 1.233 2025/09/10 14:40:02 jperkin Exp $
 
 .include "Makefile.common"
 
+PKGREVISION=   1
+
 COMMENT=       Cross platform make
 
 USE_TOOLS+=            gmake pkg-config

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.255 pkgsrc/devel/cmake/distinfo:1.256
--- pkgsrc/devel/cmake/distinfo:1.255   Mon Sep  1 08:25:16 2025
+++ pkgsrc/devel/cmake/distinfo Wed Sep 10 14:40:02 2025
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.255 2025/09/01 08:25:16 adam Exp $
+$NetBSD: distinfo,v 1.256 2025/09/10 14:40:02 jperkin Exp $
 
 BLAKE2s (cmake-4.1.1.tar.gz) = d5bc5a23d891612a0ee28209d913a3291953bc23ddaaaf4be621df2926891049
 SHA512 (cmake-4.1.1.tar.gz) = 40f16fbe66562aec574e08758c7b8a09536b8c7086fe7f6f9123e5255a9fc1aa638b0f88b3812ed5c8e6bc4550d0ee0be304dc71be6c980dbc44d1899d238e30
 Size (cmake-4.1.1.tar.gz) = 12042807 bytes
 SHA1 (patch-Auxiliary_CMakeLists.txt) = 7a26ef79be53b9d0370029e83f203440aa0be2a4
 SHA1 (patch-CMakeLists.txt) = 0fb79458828a021a96e350bc4cf12875914f868b
-SHA1 (patch-Modules_Compiler_GNU.cmake) = e06fc41fd7a49ca9f8edaabb95d4ab1cde784112
+SHA1 (patch-Modules_Compiler_GNU.cmake) = 745b3a5cd44b4a6eb2dc9452f78f9de3976f37b1
 SHA1 (patch-Modules_FindCurses.cmake) = 98cac805a6abafcfb8b61e441b50a1d6aec27ad0
 SHA1 (patch-Modules_FindGTK2.cmake) = 51b7520d35fdec2a7bfcf494fe35ce0e3863e4ee
 SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f

Index: pkgsrc/devel/cmake/patches/patch-Modules_Compiler_GNU.cmake
diff -u pkgsrc/devel/cmake/patches/patch-Modules_Compiler_GNU.cmake:1.2 pkgsrc/devel/cmake/patches/patch-Modules_Compiler_GNU.cmake:1.3
--- pkgsrc/devel/cmake/patches/patch-Modules_Compiler_GNU.cmake:1.2     Tue Apr  2 17:27:41 2024
+++ pkgsrc/devel/cmake/patches/patch-Modules_Compiler_GNU.cmake Wed Sep 10 14:40:02 2025
@@ -1,12 +1,14 @@
-$NetBSD: patch-Modules_Compiler_GNU.cmake,v 1.2 2024/04/02 17:27:41 adam Exp $
+$NetBSD: patch-Modules_Compiler_GNU.cmake,v 1.3 2025/09/10 14:40:02 jperkin Exp $
 
 Add CMAKE_PKGSRC_BUILD_FLAGS to allow pkgsrc-based builds to set
 compiler optimizer flags (overrides CMAKE_BUILD_TYPE).  Also enabled
 for CMAKE_BOOTSTRAP so it is applied to the build of cmake itself.
 
---- Modules/Compiler/GNU.cmake.orig    2024-03-21 13:32:22.000000000 +0000
+GCC on SunOS does not (yet) support LTO with the native linker.
+
+--- Modules/Compiler/GNU.cmake.orig    2025-08-27 16:33:28.000000000 +0000
 +++ Modules/Compiler/GNU.cmake
-@@ -109,9 +109,11 @@ macro(__compiler_gnu lang)
+@@ -57,9 +57,11 @@ macro(__compiler_gnu lang)
    # Initial configuration flags.
    string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
    string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g")
@@ -21,3 +23,12 @@ for CMAKE_BOOTSTRAP so it is applied to 
    if(NOT "x${lang}" STREQUAL "xFortran")
      string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -DNDEBUG")
      string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -DNDEBUG")
+@@ -99,7 +101,7 @@ macro(__compiler_gnu lang)
+       list(APPEND __lto_flags -flto)
+     endif()
+ 
+-    if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 4.7 AND NOT APPLE)
++    if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 4.7 AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+       # '-ffat-lto-objects' introduced since GCC 4.7:
+       # * https://gcc.gnu.org/onlinedocs/gcc-4.6.4/gcc/Option-Summary.html (no)
+       # * https://gcc.gnu.org/onlinedocs/gcc-4.7.4/gcc/Option-Summary.html (yes)