From nobody Fri Mar 28 05:55:21 2025 X-Original-To: dev-commits-ports-main@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 4ZP8rV20hmz5rHkW; Fri, 28 Mar 2025 05:55:22 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZP8rT653Lz45gG; Fri, 28 Mar 2025 05:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743141321; 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=dOHBrYfwJrzNtz+f/jaA855U90t/84K9KsRX2YwUW7Y=; b=Fz9kba5oY8XhC4V9CRorNaxRt8uq6iznwdNzWTYAKjpA20AqJznvVe7HRV8MjVtEm6Q7YQ MU0BAk0bLnA8HOdoKzo5aT6bzGdzE2HLeX84jLROsuDLqUlgVIfOs/S8mny2nmE3qOB7FK EOPFjRnB1p0Bz0WbY/4Pbl0FsxE5LjVCP68HbNgzg4e5dSFnMBk6EzxdO9gs9UntWIbz4E uZrc+49V84vosAP1ns5ivnxn9JZDeD43kS3NajhI4+oMl9gc1/okFIKCJ11vLRs4U3aaJN pdfZDA+iw0hvzqEQmif+f2//DcuUZ5zr5tYuiTdC+Xrx1fR8F/1FK+zncjXNvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743141321; a=rsa-sha256; cv=none; b=fv3ynXJx1U5BZ8S5ViWBhlO5qBcfZT+ZKZcdfN1Szyp/t3aS1uC0liMZdzhIMiLjeYa+GD lcztVodOsjAycaqLxSnyu5Qaf9DoQlUFOWYsQvf9Bbp+tyDRo1tPMnshF4lIquVu4cQAqh D7gQvyLCoIwWrd1GF3mEVeZTadvxBWp7sWz9eWNuGPw5W8gvPM8UTe0GM2KeOSdmQR97Hw ihdmawE6Wnz0xY2k0/qMAOllzmP1PPe0ok/3B88W/nD3IEuhhk2yCIEGV3pbbTSjamJLJc X9RVRAwrpjOYWG8x7KrnmnCnLE5o5og0lp73JqtZWHzuBmXLPkIgHrU+iXRusw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743141321; 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=dOHBrYfwJrzNtz+f/jaA855U90t/84K9KsRX2YwUW7Y=; b=sLq3lmxfe63q3UBxbxDMyfq6sCn9w7TmSZGPjeK+a8mOUsS/duLDAUcl2pAR51f++a3Khg NI5ffqug3OZu2lXHcjoEppI0uf6bYMYtt772NoIad1wl30qkt2uTFIpisw6YZx4d3eKPsu MdbM46VZZs/3QhxfGE7wXA7+p2zm44FjpTejRlCFKFxFSUXRub4cXQ/u+B93eN5iELlEtE HJPqFU96nF8HRATi9XqBR9C8tQMHQZ0i1NTr3JwHpB9c9Z4bwajq7vHRq6bXQ5Iu/PptZx R2Lspl3/ChdFdztQLaVatHACsEjFd3fkD+ZaW6N0AG7jC1aZmd4eb30kcwuDQw== 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 4ZP8rT5VK8zVVS; Fri, 28 Mar 2025 05:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52S5tLoF041234; Fri, 28 Mar 2025 05:55:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52S5tLxQ041231; Fri, 28 Mar 2025 05:55:21 GMT (envelope-from git) Date: Fri, 28 Mar 2025 05:55:21 GMT Message-Id: <202503280555.52S5tLxQ041231@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 7f69520286f5 - main - =?utf-8?Q?math/oink: update g20210710 =E2=86=92 g20250105?= List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f69520286f5be3b22fbd4f271bb15ef4c37efc0 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f69520286f5be3b22fbd4f271bb15ef4c37efc0 commit 7f69520286f5be3b22fbd4f271bb15ef4c37efc0 Author: Yuri Victorovich AuthorDate: 2025-03-28 05:25:30 +0000 Commit: Yuri Victorovich 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 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 "$<$:-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 -+#ifdef __cplusplus -+#include -+#else -+#include -+#endif - #include - #include - #include /* 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