<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/607d8f4f3f231ff96a24f2baaf0fbace12671ba7">https://github.com/macports/macports-ports/commit/607d8f4f3f231ff96a24f2baaf0fbace12671ba7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 607d8f4f3f2 vampire: update to 4.9 release
</span>607d8f4f3f2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 607d8f4f3f231ff96a24f2baaf0fbace12671ba7
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Tue Sep 3 18:58:26 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> vampire: update to 4.9 release
</span>---
math/vampire/Portfile | 18 +++++++------
...pp-fix-for-macOS-where-aligned_alloc-may-.patch | 31 ++++++++++++++++++++++
2 files changed, 41 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/vampire/Portfile b/math/vampire/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 73f9d9f1423..21f7be40163 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/vampire/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/vampire/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,19 +4,18 @@ PortSystem 1.0
</span> PortGroup cmake 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Temporarily remains commit-based until the next release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# due to important fixes being added by the upstream recently.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup vprover vampire 1b080631257a403681d1287f87f8d3ac1ee97c63
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2024-05-31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup vprover vampire 4.9 v casc2024
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 1
</span> categories math science
platforms darwin freebsd
maintainers {landonf @landonf} openmaintainer
description Vampire Theorem Prover
long_description High performance automated theorem prover.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e09d316e9fda2479726491f197d8b4edbf5e2e2f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f0f1ee2bbd10b82e0373a53357572f5f3801568e5c67aaba2fdc5209b8091a34 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1466583
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e62573a009237c43c550837ad5f34476fbdaa235 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7d0101dc296d0f6fb4f3326febf6a3f3bfd3400b36249a91794789c68a855f3d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1502934
</span>
# Vampire is BSD-licensed, embedded minisat is MIT-licensed
license BSD MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,11 +24,14 @@ github.tarball_from archive
</span>
patchfiles patch-CMakeLists.txt.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/vprover/vampire/pull/593
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0001-Allocator.cpp-fix-for-macOS-where-aligned_alloc-may-.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> cmake.build_type Release
cmake.generator Ninja
compiler.cxx_standard \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 2014
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2017
</span>
configure.args-append \
-DCMAKE_DISABLE_FIND_PACKAGE_Z3=ON
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/vampire/files/0001-Allocator.cpp-fix-for-macOS-where-aligned_alloc-may-.patch b/math/vampire/files/0001-Allocator.cpp-fix-for-macOS-where-aligned_alloc-may-.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..15ce50ce62a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/vampire/files/0001-Allocator.cpp-fix-for-macOS-where-aligned_alloc-may-.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 94819be610e27eff71e2d692c618345d405dcd17 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 3 Sep 2024 18:38:34 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Allocator.cpp: fix for macOS where aligned_alloc may not be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Lib/Allocator.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Lib/Allocator.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,6 +19,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Allocator.hpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Lib/Timer.hpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef INDIVIDUAL_ALLOCATIONS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Lib::SmallObjectAllocator Lib::GLOBAL_SMALL_OBJECT_ALLOCATOR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,9 +47,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ALLOCATED += size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Lib::TimeoutProtector tp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(__APPLE__) || (defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED >= 101300)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(void *ptr = std::aligned_alloc(align, size))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // we might be here because `aligned_alloc` is finicky (Apple, looking at you)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // so try again with `malloc` and hope for good alignment
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(void *ptr = std::malloc(size))
</span></pre><pre style='margin:0'>
</pre>