CVS commit: pkgsrc/math

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Feb 20 10:27:01 UTC 2025

Modified Files:
        pkgsrc/math/py-z3: PLIST
        pkgsrc/math/z3: Makefile.common PLIST distinfo
        pkgsrc/math/z3/patches: patch-scripts_mk__util.py
            patch-src_api_python_setup.py

Log Message:
z3 py-z3: updated to 4.14.0

4.14.0

bump timeout for jobs
Update release.yml for Azure Pipelines
Update nightly.yaml for Azure Pipelines
Update azure-pipelines.yml for Azure Pipelines
fix unit test
convert def into expression tree
adjust solve_for to handle rationals
fixes to failure conditions for unification
remove verbose output
Add unification based projection function


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/py-z3/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/math/z3/Makefile.common
cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/z3/PLIST
cvs rdiff -u -r1.18 -r1.19 pkgsrc/math/z3/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/math/z3/patches/patch-scripts_mk__util.py
cvs rdiff -u -r1.1 -r1.2 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/py-z3/PLIST
diff -u pkgsrc/math/py-z3/PLIST:1.4 pkgsrc/math/py-z3/PLIST:1.5
--- pkgsrc/math/py-z3/PLIST:1.4 Tue Aug 13 09:21:07 2024
+++ pkgsrc/math/py-z3/PLIST     Thu Feb 20 10:27:01 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2024/08/13 09:21:07 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2025/02/20 10:27:01 adam Exp $
 ${PYSITELIB}/${WHEEL_INFODIR}/METADATA
 ${PYSITELIB}/${WHEEL_INFODIR}/RECORD
 ${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
@@ -34,7 +34,7 @@ ${PYSITELIB}/z3/include/z3_replayer.h
 ${PYSITELIB}/z3/include/z3_spacer.h
 ${PYSITELIB}/z3/include/z3_v1.h
 ${PYSITELIB}/z3/lib/libz3.so
-${PYSITELIB}/z3/lib/libz3.so.4.13
+${PYSITELIB}/z3/lib/libz3.so.4.14
 ${PYSITELIB}/z3/z3.py
 ${PYSITELIB}/z3/z3.pyc
 ${PYSITELIB}/z3/z3.pyo

Index: pkgsrc/math/z3/Makefile.common
diff -u pkgsrc/math/z3/Makefile.common:1.9 pkgsrc/math/z3/Makefile.common:1.10
--- pkgsrc/math/z3/Makefile.common:1.9  Tue Aug 13 09:21:07 2024
+++ pkgsrc/math/z3/Makefile.common      Thu Feb 20 10:27:00 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.9 2024/08/13 09:21:07 adam Exp $
+# $NetBSD: Makefile.common,v 1.10 2025/02/20 10:27:00 adam Exp $
 #
 # used by math/py-z3/Makefile
 # used by math/z3/Makefile
 
-DISTNAME=      z3-4.13.0
+DISTNAME=      z3-4.14.0
 CATEGORIES=    math
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Z3Prover/}
 GITHUB_PROJECT=        z3

Index: pkgsrc/math/z3/PLIST
diff -u pkgsrc/math/z3/PLIST:1.6 pkgsrc/math/z3/PLIST:1.7
--- pkgsrc/math/z3/PLIST:1.6    Tue Aug 13 09:21:07 2024
+++ pkgsrc/math/z3/PLIST        Thu Feb 20 10:27:00 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2024/08/13 09:21:07 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2025/02/20 10:27:00 adam Exp $
 bin/z3
 include/z3++.h
 include/z3.h
@@ -19,6 +19,6 @@ lib/cmake/z3/Z3ConfigVersion.cmake
 lib/cmake/z3/Z3Targets-relwithdebinfo.cmake
 lib/cmake/z3/Z3Targets.cmake
 lib/libz3.so
-lib/libz3.so.4.13
+lib/libz3.so.4.14
 lib/libz3.so.${PKGVERSION}.0
 lib/pkgconfig/z3.pc

Index: pkgsrc/math/z3/distinfo
diff -u pkgsrc/math/z3/distinfo:1.18 pkgsrc/math/z3/distinfo:1.19
--- pkgsrc/math/z3/distinfo:1.18        Tue Aug 13 09:21:07 2024
+++ pkgsrc/math/z3/distinfo     Thu Feb 20 10:27:00 2025
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.18 2024/08/13 09:21:07 adam Exp $
+$NetBSD: distinfo,v 1.19 2025/02/20 10:27:00 adam Exp $
 
-BLAKE2s (z3-4.13.0.tar.gz) = 9476e4d41e8264b1370f57d8739140b66f3242078db7b2b9c8df140e6d766b49
-SHA512 (z3-4.13.0.tar.gz) = 8503787fe0b18592b5a131bcec2cacfa5f5096d76386a1c4fda7a836e472924b154433306d27600ff0d0758ddb710c965901fbfc2e5605919b624b9d4d1bc4fd
-Size (z3-4.13.0.tar.gz) = 5520232 bytes
-SHA1 (patch-scripts_mk__util.py) = f092c9aed3c81408a485e9c92d8dddf5db86d6fe
-SHA1 (patch-src_api_python_setup.py) = cfc4a0a388d2a096ce86cbe3ca76b32502ec380e
+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_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-scripts_mk__util.py
diff -u pkgsrc/math/z3/patches/patch-scripts_mk__util.py:1.8 pkgsrc/math/z3/patches/patch-scripts_mk__util.py:1.9
--- pkgsrc/math/z3/patches/patch-scripts_mk__util.py:1.8        Thu May 11 06:43:43 2023
+++ pkgsrc/math/z3/patches/patch-scripts_mk__util.py    Thu Feb 20 10:27:01 2025
@@ -1,19 +1,19 @@
-$NetBSD: patch-scripts_mk__util.py,v 1.8 2023/05/11 06:43:43 adam Exp $
+$NetBSD: patch-scripts_mk__util.py,v 1.9 2025/02/20 10:27:01 adam Exp $
 
 Try to at least be slightly more portable.
 
---- scripts/mk_util.py.orig    2023-01-18 03:10:26.000000000 +0000
+--- scripts/mk_util.py.orig    2025-02-18 21:41:31.000000000 +0000
 +++ scripts/mk_util.py
-@@ -1858,7 +1858,7 @@ class JavaDLLComponent(Component):
+@@ -1880,7 +1880,7 @@ class JavaDLLComponent(Component):
                  out.write('\t$(SLINK) $(SLINK_OUT_FLAG)libz3java$(SO_EXT) $(SLINK_FLAGS) -arch arm64 %s$(OBJ_EXT) libz3$(SO_EXT)\n' %
-                           os.path.join('api', 'java', 'Native'))                
+                           os.path.join('api', 'java', 'Native'))
              else:
 -                out.write('\t$(SLINK) $(SLINK_OUT_FLAG)libz3java$(SO_EXT) $(SLINK_FLAGS) %s$(OBJ_EXT) libz3$(SO_EXT)\n' %
 +                out.write('\t$(SLINK) $(SLINK_OUT_FLAG)libz3java$(SO_EXT) $(SLINK_FLAGS) $(JAVA_LINK_EXTRA_FLAGS) %s$(OBJ_EXT) libz3$(SO_EXT)\n' %
                            os.path.join('api', 'java', 'Native'))
              out.write('%s.jar: libz3java$(SO_EXT) ' % self.package_name)
              deps = ''
-@@ -2577,7 +2577,8 @@ def mk_config():
+@@ -2599,7 +2599,8 @@ def mk_config():
          check_ar()
          CXX = find_cxx_compiler()
          CC  = find_c_compiler()
@@ -23,7 +23,7 @@ Try to at least be slightly more portabl
  #       SLIBEXTRAFLAGS = '%s -Wl,-soname,libz3.so.0' % LDFLAGS
          EXE_EXT = ''
          LIB_EXT = '.a'
-@@ -2647,7 +2648,8 @@ def mk_config():
+@@ -2672,7 +2673,8 @@ def mk_config():
              EXE_EXT        = '.exe'
              LIB_EXT        = '.lib'
          else:
@@ -33,7 +33,7 @@ Try to at least be slightly more portabl
          if is64():
              if not sysname.startswith('CYGWIN') and not sysname.startswith('MSYS') and not sysname.startswith('MINGW'):
                  CXXFLAGS     = '%s -fPIC' % CXXFLAGS
-@@ -2696,6 +2698,7 @@ def mk_config():
+@@ -2721,6 +2723,7 @@ def mk_config():
          config.write('SLINK_FLAGS=%s\n' % SLIBFLAGS)
          config.write('SLINK_EXTRA_FLAGS=-lpthread %s\n' % SLIBEXTRAFLAGS)
          config.write('SLINK_OUT_FLAG=-o \n')

Index: pkgsrc/math/z3/patches/patch-src_api_python_setup.py
diff -u pkgsrc/math/z3/patches/patch-src_api_python_setup.py:1.1 pkgsrc/math/z3/patches/patch-src_api_python_setup.py:1.2
--- pkgsrc/math/z3/patches/patch-src_api_python_setup.py:1.1    Thu May 11 06:43:43 2023
+++ pkgsrc/math/z3/patches/patch-src_api_python_setup.py        Thu Feb 20 10:27:01 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_api_python_setup.py,v 1.1 2023/05/11 06:43:43 adam Exp $
+$NetBSD: patch-src_api_python_setup.py,v 1.2 2025/02/20 10:27:01 adam Exp $
 
 Some platforms do not support LTO.
 
---- src/api/python/setup.py.orig       2023-05-10 16:39:33.324575995 +0000
+--- src/api/python/setup.py.orig       2025-02-18 21:41:31.000000000 +0000
 +++ src/api/python/setup.py
-@@ -110,7 +110,7 @@ def _configure_z3():
-         'CMAKE_BUILD_TYPE' : 'Release',
-         'Z3_BUILD_EXECUTABLE' : True,
-         'Z3_BUILD_LIBZ3_SHARED' : True,
--        'Z3_LINK_TIME_OPTIMIZATION' : True,
-+        'Z3_LINK_TIME_OPTIMIZATION' : False,
-         'WARNINGS_AS_ERRORS' : 'SERIOUS_ONLY',
-         # Disable Unwanted Options
-         'Z3_USE_LIB_GMP' : False, # Is default false in python build
+@@ -26,7 +26,7 @@ SRC_DIR_REPO = os.path.join(ROOT_DIR, '.
+ SRC_DIR = SRC_DIR_LOCAL if os.path.exists(SRC_DIR_LOCAL) else SRC_DIR_REPO
+ 
+ IS_SINGLE_THREADED = False
+-ENABLE_LTO = True
++ENABLE_LTO = False
+ 
+ IS_PYODIDE = 'PYODIDE_ROOT' in os.environ and os.environ.get('_PYTHON_HOST_PLATFORM', '').startswith('emscripten')
+