CVS commit: pkgsrc/math/z3

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Mar  4 05:09:51 UTC 2025

Modified Files:
        pkgsrc/math/z3: buildlink3.mk distinfo
        pkgsrc/math/z3/patches: patch-src_api_python_setup.py

Log Message:
z3: allow building on all platforms


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/z3/buildlink3.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/math/z3/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/z3/patches/patch-src_api_python_setup.py

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

Modified files:

Index: pkgsrc/math/z3/buildlink3.mk
diff -u pkgsrc/math/z3/buildlink3.mk:1.5 pkgsrc/math/z3/buildlink3.mk:1.6
--- pkgsrc/math/z3/buildlink3.mk:1.5    Wed Feb 21 10:50:35 2024
+++ pkgsrc/math/z3/buildlink3.mk        Tue Mar  4 05:09:51 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2024/02/21 10:50:35 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2025/03/04 05:09:51 adam Exp $
 
 BUILDLINK_TREE+=       z3
 
@@ -8,7 +8,7 @@ Z3_BUILDLINK3_MK:=
 USE_CXX_FEATURES+=     c++17
 
 BUILDLINK_API_DEPENDS.z3+=     z3>=4.8.3
-BUILDLINK_ABI_DEPENDS.z3?=     z3>=4.12.2nb1
+BUILDLINK_ABI_DEPENDS.z3+=     z3>=4.12.2nb1
 BUILDLINK_PKGSRCDIR.z3?=       ../../math/z3
 
 .endif  # Z3_BUILDLINK3_MK

Index: pkgsrc/math/z3/distinfo
diff -u pkgsrc/math/z3/distinfo:1.19 pkgsrc/math/z3/distinfo:1.20
--- pkgsrc/math/z3/distinfo:1.19        Thu Feb 20 10:27:00 2025
+++ pkgsrc/math/z3/distinfo     Tue Mar  4 05:09:51 2025
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.19 2025/02/20 10:27:00 adam Exp $
+$NetBSD: distinfo,v 1.20 2025/03/04 05:09:51 adam Exp $
 
 BLAKE2s (z3-4.14.0.tar.gz) = e29081864c70fafa547f834a18c5e82805fda40e3bcae12cc281de5d7b5d09ed
 SHA512 (z3-4.14.0.tar.gz) = 5a3de3207b5c05f77f8369d7fdbb9e13a7db850f8c3edaa8f2adfcf58b186d34409e4a56d44646f853027850941135be5042e67a53ddf3302dc3b645c1ab3db4
 Size (z3-4.14.0.tar.gz) = 5841848 bytes
 SHA1 (patch-scripts_mk__util.py) = 56380c984c667ecf3861d3a329a6425d4a93bb1e
-SHA1 (patch-src_api_python_setup.py) = 16ee41bbd2af5f7009fc3c9971187af142f4e33c
+SHA1 (patch-src_api_python_setup.py) = 90756d137a1c447515cdfdda26487c6a1adada5f
 SHA1 (patch-src_ast_rewriter_seq__eq__solver.cpp) = 31cf8fc41855a4b3b5b6a10de88f613054719bc0
 SHA1 (patch-src_sat_sat__lookahead.cpp) = c091d8b267b5476e438888e82c9161599873264c
 SHA1 (patch-src_sat_sat__solver.cpp) = 0e279f291801901eabb11b7cb0268c137a3b41fe

Index: pkgsrc/math/z3/patches/patch-src_api_python_setup.py
diff -u pkgsrc/math/z3/patches/patch-src_api_python_setup.py:1.2 pkgsrc/math/z3/patches/patch-src_api_python_setup.py:1.3
--- pkgsrc/math/z3/patches/patch-src_api_python_setup.py:1.2    Thu Feb 20 10:27:01 2025
+++ pkgsrc/math/z3/patches/patch-src_api_python_setup.py        Tue Mar  4 05:09:51 2025
@@ -1,7 +1,9 @@
-$NetBSD: patch-src_api_python_setup.py,v 1.2 2025/02/20 10:27:01 adam Exp $
+$NetBSD: patch-src_api_python_setup.py,v 1.3 2025/03/04 05:09:51 adam Exp $
 
 Some platforms do not support LTO.
 
+Do not override finalize_options(). This allows to build on all platforms.
+
 --- src/api/python/setup.py.orig       2025-02-18 21:41:31.000000000 +0000
 +++ src/api/python/setup.py
 @@ -26,7 +26,7 @@ SRC_DIR_REPO = os.path.join(ROOT_DIR, '.
@@ -13,3 +15,33 @@ Some platforms do not support LTO.
  
  IS_PYODIDE = 'PYODIDE_ROOT' in os.environ and os.environ.get('_PYTHON_HOST_PLATFORM', '').startswith('emscripten')
  
+@@ -295,29 +295,6 @@ class bdist_wheel(_bdist_wheel):
+         return os_version_tag
+             
+             
+-    def finalize_options(self):
+-        if BUILD_ARCH is not None and BUILD_PLATFORM is not None:
+-            os_version_tag = '_'.join(BUILD_OS_VERSION) if BUILD_OS_VERSION is not None else 'xxxxxx'
+-            os_version_tag = self.remove_build_machine_os_version(BUILD_PLATFORM, os_version_tag)
+-            TAGS = {
+-                # linux tags cannot be deployed - they must be auditwheel'd to pick the right compatibility tag based on imported libc symbol versions
+-                ("linux", "x86_64"): "linux_x86_64",
+-                ("linux", "aarch64"): "linux_aarch64",
+-                # windows arm64 is not supported by pypi yet
+-                ("win", "x64"): "win_amd64",
+-                ("win", "x86"): "win32",
+-                ("osx", "x64"): f"macosx_{os_version_tag}_x86_64",
+-                ("osx", "arm64"): f"macosx_{os_version_tag}_arm64",
+-                ("darwin", "x86_64"): f"macosx_{os_version_tag}_x86_64",
+-                ("darwin", "x64"): f"macosx_{os_version_tag}_x86_64",
+-                ("darwin", "arm64"): f"macosx_{os_version_tag}_arm64",
+-                ("sequoia", "x64"): f"macosx_{os_version_tag}_x86_64",
+-                ("sequoia", "x86_64"): f"macosx_{os_version_tag}_x86_64",
+-                ("sequoia", "arm64"): f"macosx_{os_version_tag}_arm64",
+-                ("emscripten", "wasm32"): f"emscripten_{os_version_tag}_wasm32",
+-            }  # type: dict[tuple[str, str], str]
+-            self.plat_name = TAGS[(BUILD_PLATFORM, BUILD_ARCH)]
+-        return super().finalize_options()
+ 
+ 
+ setup(