Merge pull request #23970 from fangyi-zhou/z3-4.12.2-fix-gcc-13

Add Z3 4.12.2 compilation fix for GCC 13

Author: mseri

packages/z3/z3.4.12.2-1/files/fix-gcc-13.patch

@@ -0,0 +1,28 @@
+From 520e692a43c41e8981eb091494bef0297ecbe3c6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tomasz=20K=C5=82oczko?=
+ <[email protected]>
+Date: Sat, 13 May 2023 17:37:35 +0100
+Subject: [PATCH] Fix building with gcc 13 (#6723)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Trivial fix to build with gcc 13 reported in #6722.
+
+Signed-off-by: Tomasz Kłoczko <[email protected]>
+---
+ src/util/tptr.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/util/tptr.h b/src/util/tptr.h
+index 6213b2efa40..2a35af5353d 100644
+--- a/src/util/tptr.h
++++ b/src/util/tptr.h
+@@ -20,6 +20,7 @@ Revision History:
+ #pragma once
+ 
+ #include "util/machine.h"
++#include <cstdint>
+ 
+ #define TAG_SHIFT        PTR_ALIGNMENT
+ #define ALIGNMENT_VALUE  (1 << PTR_ALIGNMENT)

packages/z3/z3.4.12.2-1/opam

@@ -0,0 +1,47 @@
+opam-version: "2.0"
+maintainer: "[email protected]"
+authors: "MSR"
+homepage: "https://github.com/Z3prover/z3"
+bug-reports: "https://github.com/Z3prover/z3/issues"
+license: "MIT"
+dev-repo: "git+https://github.com/Z3prover/z3.git"
+depexts: [
+  ["python3-distutils"] {os-family = "debian"}
+]
+patches: ["fix-gcc-13.patch"]
+build: [
+  [ "python3" "scripts/mk_make.py" "--ml" ]
+  [ make "-C" "build" "-j" jobs ]
+]
+
+install: [
+  [ "sh" "-c" "ocamlfind install z3 build/api/ml/* -dll build/libz3.*"]
+  [ "cp" "build/z3" "%{bin}%/z3"]
+]
+
+depends: [
+  "ocaml" {>= "4.08.0"}
+  "ocamlfind" {build}
+  "zarith"
+  "conf-gmp"
+  "conf-python-3" {build}
+  "conf-c++" {build}
+]
+x-ci-accept-failures: [
+  "centos-7" "oraclelinux-7" # C compiler is too old
+]
+conflicts: [
+  "ocaml-option-bytecode-only"
+]
+synopsis: "Z3 solver"
+extra-files: [
+  ["fix-gcc-13.patch" "md5=f9078b5316a8f8cc8f11a3846a21811e"]
+]
+url {
+  src:
+    "https://github.com/Z3Prover/z3/archive/refs/tags/z3-4.12.2.tar.gz"
+  checksum: [
+    "sha256=9f58f3710bd2094085951a75791550f547903d75fe7e2fcb373c5f03fc761b8f"
+    "sha512=375477cbbc9837b44e752c89916409d07bf6a73830b52878aab4f376f08b37dd5ab485da225744d394ab15f2a7e1014edc3be5eb9962934c440a8d55259317e2"
+  ]
+}