From nobody Sun Feb 12 13:09:43 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PF79N01fGz3pdqp; Sun, 12 Feb 2023 13:09:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PF79M6DVYz4F63; Sun, 12 Feb 2023 13:09:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676207383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HiUojnFRH1E1j9/00g+rfyKrHEf+2K2tc3AW1VxYlDQ=; b=geaWhd07/+dl2X+LkFJAvQ6vLZl/ElFUO/PkzOnHYAyLltQwQOP9b10LCfMwArv/FSOMgH V9GkQGq4uUjZ1DIesTltnbbRNtEI7Ixih+PvHwjlKdTEwqNc6PEU/px5xJJzOwNwVWRwiW FVH5YV8m8kakyrHrlRzBD+LVyvzbUgl6LPgwUgHbe0kwuv1z9bUFRGWmHhvbb5QX9gc7AM m3Zbg5roLrzFgmL4zldbZZ873PtEfLOSS0VAhTxlJ6XC/kKyk2/AM9KOdcXITHpXbsx9/s Drpm6pqhLmr8AccO70VWNyDXJG7NGJyG8ON6rx4fqL8my+dwACp2b+ptWSmqgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676207383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HiUojnFRH1E1j9/00g+rfyKrHEf+2K2tc3AW1VxYlDQ=; b=oAGQ2xBGxmOtBx0o1yzRUvJxS9Lcp2ZvXrBnNpI2ulTEkI+xmcB09r+er7vNdGWIUCFrp9 b+lO46Yex28aCu7+y8KL69Gl7PXgdEObnLa0ajHxlozCO+XNwOwiAAtmY/lzj0UjZ8qkUh sKSiZQWqW9QZqSEH60HUnS7aHFNANIb7jGagenHfb5NIIJNTiOdQG8I1wHnxvodAUegiZc Rixn8ez5XQn7NjmofbFVFPKAJMU4mSCYi9gx8ptQnqrATLCapu9B0iuUi66rWOunVkLVNu EDcdOT9520ExvKz1+3KvlCjaLqaiNBJe9MFydBsRUyaDESQu4wqyWOnEpqOyNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676207383; a=rsa-sha256; cv=none; b=wHJT4VyjJ6KxFjRuFp+2mwrf0zG9Axgtm6ObhkgS7cge97kX1SldvqwpLwyuKb0L2c5tI1 iQhASvLyDjzhYAWJPLnwTDHv1/vikOogsRyB/d3ZqefdGRg1OJ+P81yw9go3QmQbsrjBox NsfmNzH6oLrGm6sjKbvUjV1ELEK+SNXdVTHRA+F1LYPfPR6/aa2sRFiPctsPNoXS+kW+4R +jwl8drirAG83H4ut3RDfJs6W2vh8zGGkvdAdAGh7DLw2YtSocy+guGxvddCAYLiMTJbk0 WlbT76XYz6vw0LHFTC9b/j22sYlqgLlRGF1O71fSSG1qRbuUAFOpILZqUs/9fQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PF79M51trzfXm; Sun, 12 Feb 2023 13:09:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31CD9hwh011984; Sun, 12 Feb 2023 13:09:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31CD9heT011983; Sun, 12 Feb 2023 13:09:43 GMT (envelope-from git) Date: Sun, 12 Feb 2023 13:09:43 GMT Message-Id: <202302121309.31CD9heT011983@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: f52ed517f2ef - main - math/z3: Update to 4.12.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f52ed517f2ef24237c31e657f442dd1ec4038bf2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=f52ed517f2ef24237c31e657f442dd1ec4038bf2 commit f52ed517f2ef24237c31e657f442dd1ec4038bf2 Author: Gleb Popov AuthorDate: 2023-02-12 13:09:16 +0000 Commit: Gleb Popov CommitDate: 2023-02-12 13:09:38 +0000 math/z3: Update to 4.12.1 --- math/z3/Makefile | 4 +- math/z3/distinfo | 6 +- math/z3/files/patch-src_util_memory__manager.cpp | 77 ------------------------ 3 files changed, 5 insertions(+), 82 deletions(-) diff --git a/math/z3/Makefile b/math/z3/Makefile index 0df189d2514f..5a42937e41d7 100644 --- a/math/z3/Makefile +++ b/math/z3/Makefile @@ -1,6 +1,6 @@ PORTNAME= z3 DISTVERSIONPREFIX= z3- -DISTVERSION= 4.10.2 +DISTVERSION= 4.12.1 CATEGORIES= math MAINTAINER= arrowd@FreeBSD.org @@ -18,7 +18,7 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} USE_LDCONFIG= yes -OPTIONS_DEFINE= DEBUG STATIC GMP +OPTIONS_DEFINE= STATIC GMP OPTIONS_SUB= yes diff --git a/math/z3/distinfo b/math/z3/distinfo index c1d82694683f..9fec410ddec3 100644 --- a/math/z3/distinfo +++ b/math/z3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660222509 -SHA256 (Z3Prover-z3-z3-4.10.2_GH0.tar.gz) = 889fd035b833775c8cd2eb4723eb011bf916a3e9bf08ce66b31c548acee7a321 -SIZE (Z3Prover-z3-z3-4.10.2_GH0.tar.gz) = 5367336 +TIMESTAMP = 1676206397 +SHA256 (Z3Prover-z3-z3-4.12.1_GH0.tar.gz) = a3735fabf00e1341adcc70394993c05fd3e2ae167a3e9bb46045e33084eb64a3 +SIZE (Z3Prover-z3-z3-4.12.1_GH0.tar.gz) = 5470095 diff --git a/math/z3/files/patch-src_util_memory__manager.cpp b/math/z3/files/patch-src_util_memory__manager.cpp deleted file mode 100644 index 8616f05b8f5a..000000000000 --- a/math/z3/files/patch-src_util_memory__manager.cpp +++ /dev/null @@ -1,77 +0,0 @@ -Z3 memory manager stores actual data along with its size, which causes the -memory to be 8-byte aligned. Use malloc non-portable functions to obtain -memory region size instead. - -https://github.com/Z3Prover/z3/issues/6015 - ---- src/util/memory_manager.cpp.orig 2022-05-05 00:16:30 UTC -+++ src/util/memory_manager.cpp -@@ -13,6 +13,7 @@ --*/ - #include "util/error_codes.h" - #include "util/debug.h" - #include "util/scoped_timer.h" -+#include - // The following two function are automatically generated by the mk_make.py script. - // The script collects ADD_INITIALIZER and ADD_FINALIZER commands in the .h files. - // For example, rational.h contains -@@ -258,52 +259,43 @@ void memory::deallocate(void * p) { - } - - void memory::deallocate(void * p) { -- size_t * sz_p = reinterpret_cast(p) - 1; -- size_t sz = *sz_p; -- void * real_p = reinterpret_cast(sz_p); -- g_memory_thread_alloc_size -= sz; -- free(real_p); -+ g_memory_thread_alloc_size -= malloc_usable_size(p); -+ if (g_memory_thread_alloc_size < 0) g_memory_thread_alloc_size = 0; -+ free(p); - if (g_memory_thread_alloc_size < -SYNCH_THRESHOLD) { - synchronize_counters(false); - } - } - - void * memory::allocate(size_t s) { -- s = s + sizeof(size_t); // we allocate an extra field! - void * r = malloc(s); - if (r == 0) { - throw_out_of_memory(); - return nullptr; - } -- *(static_cast(r)) = s; - g_memory_thread_alloc_size += s; - g_memory_thread_alloc_count += 1; - if (g_memory_thread_alloc_size > SYNCH_THRESHOLD) { - synchronize_counters(true); - } - -- return static_cast(r) + 1; // we return a pointer to the location after the extra field -+ return r; // we return a pointer to the location after the extra field - } - - void* memory::reallocate(void *p, size_t s) { -- size_t *sz_p = reinterpret_cast(p)-1; -- size_t sz = *sz_p; -- void *real_p = reinterpret_cast(sz_p); -- s = s + sizeof(size_t); // we allocate an extra field! -- -- g_memory_thread_alloc_size += s - sz; -+ g_memory_thread_alloc_size += s - malloc_usable_size(p); -+ if (g_memory_thread_alloc_size < 0) g_memory_thread_alloc_size = 0; - g_memory_thread_alloc_count += 1; - if (g_memory_thread_alloc_size > SYNCH_THRESHOLD) { - synchronize_counters(true); - } - -- void *r = realloc(real_p, s); -+ void *r = realloc(p, s); - if (r == 0) { - throw_out_of_memory(); - return nullptr; - } -- *(static_cast(r)) = s; -- return static_cast(r) + 1; // we return a pointer to the location after the extra field -+ return r; - } - - #else