git: 7f69520286f5 - main - math/oink: update g20210710 → g20250105
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 28 Mar 2025 05:55:21 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7f69520286f5be3b22fbd4f271bb15ef4c37efc0
commit 7f69520286f5be3b22fbd4f271bb15ef4c37efc0
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2025-03-28 05:25:30 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2025-03-28 05:55:17 +0000
math/oink: update g20210710 → g20250105
---
math/oink/Makefile | 17 +++++++++--------
math/oink/distinfo | 6 +++---
math/oink/files/patch-CMakeLists.txt | 17 +++++++++--------
math/oink/files/patch-src_lace.h | 27 ---------------------------
math/oink/pkg-plist | 9 +++++++--
5 files changed, 28 insertions(+), 48 deletions(-)
diff --git a/math/oink/Makefile b/math/oink/Makefile
index c182d24c07c0..7df176aa7382 100644
--- a/math/oink/Makefile
+++ b/math/oink/Makefile
@@ -1,6 +1,5 @@
PORTNAME= oink
-DISTVERSION= g20210710
-PORTREVISION= 7
+DISTVERSION= g20250105
CATEGORIES= math
MAINTAINER= yuri@FreeBSD.org
@@ -10,18 +9,20 @@ WWW= https://github.com/trolando/oink
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BROKEN= fails to build with boost-1.85+
-
-LIB_DEPENDS= libboost_iostreams.so:devel/boost-libs
+LIB_DEPENDS= libboost_iostreams.so:devel/boost-libs \
+ liblace.so:devel/lace
USES= cmake:testing
USE_CXXSTD= c++14
-USE_GITHUB= yes
-GH_ACCOUNT= trolando
-GH_TAGNAME= 3327c54
USE_LDCONFIG= yes
+USE_GITHUB= yes
+GH_ACCOUNT= trolando
+GH_TAGNAME= 32950f2
CMAKE_ON= BUILD_SHARED_LIBS
+CMAKE_OFF= OINK_BUILD_NATIVE
+
+# tests as of g20250105: 59% tests passed, 14 tests failed out of 34 # failures are likely from some test running too high in memory, because individual tests all pass when standalone
.include <bsd.port.mk>
diff --git a/math/oink/distinfo b/math/oink/distinfo
index 3eeb22aa1ac0..4a0869dc6bbd 100644
--- a/math/oink/distinfo
+++ b/math/oink/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1647124747
-SHA256 (trolando-oink-g20210710-3327c54_GH0.tar.gz) = 5c4f1658531fcfca394cb46412143ccebc70153953d398942609b18f999a136a
-SIZE (trolando-oink-g20210710-3327c54_GH0.tar.gz) = 178207
+TIMESTAMP = 1743124350
+SHA256 (trolando-oink-g20250105-32950f2_GH0.tar.gz) = 39b42b0aff95217db42e319baba0b18a945ce27794cfbbe96e894e09416045da
+SIZE (trolando-oink-g20250105-32950f2_GH0.tar.gz) = 8888495
diff --git a/math/oink/files/patch-CMakeLists.txt b/math/oink/files/patch-CMakeLists.txt
index eb04dfb8a137..d2712483dc57 100644
--- a/math/oink/files/patch-CMakeLists.txt
+++ b/math/oink/files/patch-CMakeLists.txt
@@ -1,10 +1,11 @@
---- CMakeLists.txt.orig 2021-12-26 00:23:48 UTC
+--- CMakeLists.txt.orig 2025-03-28 04:18:13 UTC
+++ CMakeLists.txt
-@@ -46,7 +46,6 @@ add_library(oink::oink ALIAS oink)
+@@ -24,7 +24,7 @@ find_package(Boost REQUIRED COMPONENTS filesystem iost
+ find_package(Boost REQUIRED COMPONENTS filesystem iostreams regex system random CONFIG)
+
+ # Main library target
+-add_library(oink STATIC)
++add_library(oink)
+ add_library(oink::oink ALIAS oink)
set_target_properties(oink PROPERTIES VERSION ${oink_VERSION} SOVERSION ${oink_VERSION_MAJOR})
- target_compile_features(oink PUBLIC c_std_11 cxx_std_11)
- target_compile_options(oink PRIVATE -Wall -Wextra)
--target_compile_options(oink PRIVATE "$<$<CONFIG:Release,RelWithDebInfo>:-march=native>")
- target_include_directories(oink
- PRIVATE
- ${CMAKE_CURRENT_LIST_DIR}/src
+
diff --git a/math/oink/files/patch-src_lace.h b/math/oink/files/patch-src_lace.h
deleted file mode 100644
index 58b02f30be38..000000000000
--- a/math/oink/files/patch-src_lace.h
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/lace.h.orig 2021-07-10 20:56:55 UTC
-+++ src/lace.h
-@@ -17,6 +17,11 @@
- */
-
- #include <unistd.h>
-+#ifdef __cplusplus
-+#include <atomic>
-+#else
-+#include <stdatomic.h>
-+#endif
- #include <stdint.h>
- #include <stdio.h>
- #include <pthread.h> /* for pthread_t */
-@@ -293,7 +298,11 @@ void lace_yield(WorkerP *__lace_worker, Task *__lace_d
- #endif
-
- #ifndef mfence
--#define mfence() { asm volatile("mfence" ::: "memory"); }
-+#ifdef __cplusplus
-+#define mfence() std::atomic_thread_fence(std::memory_order_seq_cst)
-+#else
-+#define mfence() atomic_thread_fence(memory_order_seq_cst)
-+#endif
- #endif
-
- /* Compiler specific branch prediction optimization */
diff --git a/math/oink/pkg-plist b/math/oink/pkg-plist
index 8e85ca69aca5..1af72370dcf6 100644
--- a/math/oink/pkg-plist
+++ b/math/oink/pkg-plist
@@ -2,10 +2,15 @@ bin/oink
include/oink/bitset.hpp
include/oink/error.hpp
include/oink/game.hpp
+include/oink/libpopcnt.h
include/oink/oink.hpp
+include/oink/solver.hpp
+include/oink/solvers.hpp
include/oink/uintqueue.hpp
+lib/cmake/oink/oink-config-version.cmake
+lib/cmake/oink/oink-config.cmake
+lib/cmake/oink/oink-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/oink/oink-targets.cmake
lib/liboink.so
lib/liboink.so.1
lib/liboink.so.1.0.0
-lib/oink/cmake/OinkConfig-%%CMAKE_BUILD_TYPE%%.cmake
-lib/oink/cmake/OinkConfig.cmake