CVS commit: pkgsrc/emulators/keystone

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Aug 19 10:15:19 UTC 2025

Modified Files:
        pkgsrc/emulators/keystone: Makefile buildlink3.mk distinfo
        pkgsrc/emulators/keystone/patches: patch-llvm_CMakeLists.txt
Added Files:
        pkgsrc/emulators/keystone/patches: patch-CMakeLists.txt

Log Message:
keystone: fix build with cmake 4


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/emulators/keystone/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/keystone/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/keystone/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/keystone/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/emulators/keystone/patches/patch-llvm_CMakeLists.txt

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

Modified files:

Index: pkgsrc/emulators/keystone/Makefile
diff -u pkgsrc/emulators/keystone/Makefile:1.9 pkgsrc/emulators/keystone/Makefile:1.10
--- pkgsrc/emulators/keystone/Makefile:1.9      Sun Aug 25 06:18:40 2024
+++ pkgsrc/emulators/keystone/Makefile  Tue Aug 19 10:15:19 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2024/08/25 06:18:40 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2025/08/19 10:15:19 wiz Exp $
 
 PKGREVISION= 2
 .include "Makefile.common"
@@ -11,6 +11,7 @@ LICENSE=      gnu-gpl-v2
 
 CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
 CMAKE_CONFIGURE_ARGS+= -DLLVM_TARGETS_TO_BUILD=all
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
 .include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/emulators/keystone/buildlink3.mk
diff -u pkgsrc/emulators/keystone/buildlink3.mk:1.2 pkgsrc/emulators/keystone/buildlink3.mk:1.3
--- pkgsrc/emulators/keystone/buildlink3.mk:1.2 Mon Aug 14 05:24:21 2023
+++ pkgsrc/emulators/keystone/buildlink3.mk     Tue Aug 19 10:15:19 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2023/08/14 05:24:21 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2025/08/19 10:15:19 wiz Exp $
 
 BUILDLINK_TREE+=       keystone
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        keystone
 KEYSTONE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.keystone+=       keystone>=0.9
-BUILDLINK_ABI_DEPENDS.keystone?=               keystone>=0.9.2nb2
+BUILDLINK_ABI_DEPENDS.keystone?=       keystone>=0.9.2nb2
 BUILDLINK_PKGSRCDIR.keystone?=         ../../emulators/keystone
 .endif # KEYSTONE_BUILDLINK3_MK
 

Index: pkgsrc/emulators/keystone/distinfo
diff -u pkgsrc/emulators/keystone/distinfo:1.5 pkgsrc/emulators/keystone/distinfo:1.6
--- pkgsrc/emulators/keystone/distinfo:1.5      Tue Oct 26 10:23:52 2021
+++ pkgsrc/emulators/keystone/distinfo  Tue Aug 19 10:15:19 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:23:52 nia Exp $
+$NetBSD: distinfo,v 1.6 2025/08/19 10:15:19 wiz Exp $
 
 BLAKE2s (keystone-0.9.2.tar.gz) = 9a32cd25b940e1a1f6bb5e6f1292cdcd7a8500b668ebf201ac5ebcafbd9c84a8
 SHA512 (keystone-0.9.2.tar.gz) = 5d4dd30410410bc7848e75a2e31e8ecef6241ad25e21963aa7a07bbea21d95b75e235c80573129014102684c9647710ace3c0776a8401844d7e4b45cab7bd04b
 Size (keystone-0.9.2.tar.gz) = 4433222 bytes
-SHA1 (patch-llvm_CMakeLists.txt) = e2526c7d655121c4ea5d3a0e20a260ee3b3b408e
+SHA1 (patch-CMakeLists.txt) = 0bd1626922dce88625f357e3f17365708b6ebc39
+SHA1 (patch-llvm_CMakeLists.txt) = 0eb3728658f03927e4a5834b930b3bf19218b85d

Index: pkgsrc/emulators/keystone/patches/patch-llvm_CMakeLists.txt
diff -u pkgsrc/emulators/keystone/patches/patch-llvm_CMakeLists.txt:1.1 pkgsrc/emulators/keystone/patches/patch-llvm_CMakeLists.txt:1.2
--- pkgsrc/emulators/keystone/patches/patch-llvm_CMakeLists.txt:1.1     Wed Feb 10 10:35:13 2021
+++ pkgsrc/emulators/keystone/patches/patch-llvm_CMakeLists.txt Tue Aug 19 10:15:19 2025
@@ -1,10 +1,28 @@
-$NetBSD: patch-llvm_CMakeLists.txt,v 1.1 2021/02/10 10:35:13 adam Exp $
+$NetBSD: patch-llvm_CMakeLists.txt,v 1.2 2025/08/19 10:15:19 wiz Exp $
+
+Fix build with cmake 4.
 
 On Darwin, use correct install_name.
 
---- llvm/CMakeLists.txt.orig   2021-02-09 13:03:37.000000000 +0000
+--- llvm/CMakeLists.txt.orig   2020-06-21 12:03:54.000000000 +0000
 +++ llvm/CMakeLists.txt
-@@ -455,8 +455,6 @@ set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LL
+@@ -13,15 +13,6 @@ if(POLICY CMP0022)
+   cmake_policy(SET CMP0022 NEW) # automatic when 2.8.12 is required
+ endif()
+ 
+-if (POLICY CMP0051)
+-  # CMake 3.1 and higher include generator expressions of the form
+-  # $<TARGETLIB:obj> in the SOURCES property.  These need to be
+-  # stripped everywhere that access the SOURCES property, so we just
+-  # defer to the OLD behavior of not including generator expressions
+-  # in the output for now.
+-  cmake_policy(SET CMP0051 OLD)
+-endif()
+-
+ if(CMAKE_VERSION VERSION_LESS 3.1.20141117)
+   set(cmake_3_2_USES_TERMINAL)
+ else()
+@@ -455,8 +446,6 @@ set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LL
  
  set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
  if (APPLE)

Added files:

Index: pkgsrc/emulators/keystone/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/emulators/keystone/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Tue Aug 19 10:15:19 2025
+++ pkgsrc/emulators/keystone/patches/patch-CMakeLists.txt      Tue Aug 19 10:15:19 2025
@@ -0,0 +1,22 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2025/08/19 10:15:19 wiz Exp $
+
+Fix build with cmake 4.
+
+--- CMakeLists.txt.orig        2025-08-19 10:14:17.969503233 +0000
++++ CMakeLists.txt
+@@ -18,15 +18,6 @@ if (POLICY CMP0022)
+   cmake_policy(SET CMP0022 NEW) # automatic when 2.8.12 is required
+ endif()
+ 
+-if (POLICY CMP0051)
+-  # CMake 3.1 and higher include generator expressions of the form
+-  # $<TARGETLIB:obj> in the SOURCES property.  These need to be
+-  # stripped everywhere that access the SOURCES property, so we just
+-  # defer to the OLD behavior of not including generator expressions
+-  # in the output for now.
+-  cmake_policy(SET CMP0051 OLD)
+-endif()
+-
+ if (POLICY CMP0063)
+   set(CMAKE_POLICY_DEFAULT_CMP0063 NEW) # automatic when 3.3.2 is required
+ endif()