From nobody Tue Apr 9 07:41:19 2024 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 4VDHvh68pdz5Gtkp; Tue, 9 Apr 2024 07:41:20 +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 4VDHvg2BTwz4RK5; Tue, 9 Apr 2024 07:41:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712648479; 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=NhbX/ybalNyU2E57bB0US3QUDSSdUi/H+qPRbNBLnos=; b=v4XzO+DyDFsGDVh/UVYrXlZBiEH22/OovSTzF+6t/VtK+5Q5Xtes8BfB4dB1IXfz6FhZ7B yyQgpgWzt+JFslm4w4iTT9Vr/hd87YpMMCELlr60i/3qlgWiKbA69q+V/sUkTC+I0Ey4cK X+7BmfbEnaAUIJxsqYU0f0ocZQfks8LtXRQ0r8hEi96rGrazOisFOugQsypWbZzwaJdLrv GW3RrYFtv4Vzkdarj6h979hJX9ixP3fv2KYb0eN0DHwz2MEP6yRHr1MZJ4Y5PYo1YpaEWO gGZH/WtlPwQqIfDeWvKGTJRCnD6XNV4u+zeNesNGS//3W91RZGfLEgS94WcIew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712648479; a=rsa-sha256; cv=none; b=aKrVyCHDmfRKRrGi/bHGYjTATzjD8gyxK9FAnx0dyOpD4lRfRqjgvwxzJWWDXP5JyzMjxl 4LSlEO0CFlnOSJRYmWQ7qSjKY8z7PEodhEO3eOjuKNO/p7/Aco2Jl5mh6WZDTpuhTfo36/ I/k2/5Yk3GBwHwmVKGHIj5vvAnmwJUTktPOyO4aGUTQtl8evmm/084mvG5bmSmBt3QQ76H cgvSwcQyJngLkYZZ9j11kKWQXG99P303+0IAxDoB9tW5dCSnjIGDaxY9jlJAQbv/EPTn8x gifmrqtUcjI5j4xVSLjiQ5rYQiOVYT7ua3PHH0aTHKFhqmKR+XhNq9IkPPQ56g== 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=1712648479; 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=NhbX/ybalNyU2E57bB0US3QUDSSdUi/H+qPRbNBLnos=; b=qUmGhGuiYmsqQ+HvrAxnEwkICA/YVViX8bCS++3rzg5V2azkw/SnDvVMltP+cpK2iQRqmt kInCjUPXfoIHCgtR50d1/0CHJC/ye8aXGIoWGOF4ciV0wyKMjGp3224t1OV6J7zsjQS2GM H8oUZLXVquESFlLhYszrNTuPH0rsR2oEHXLWuAayjX3RFFjouBD1U6P9+/+dhIPlkshTYM lEa6pNfwl+7l7rcJAPSktQ+1C71E8FAVfNrMjG8yaHgWCouyAK+gXU1gfLSgw8J59pgxmY NNywRq1JFKWusUKSjM5Df8WYuA9ft6FIeOixW52B5+PEcixu6AYV9n/LZXjdRQ== 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 4VDHvg1prxzmGM; Tue, 9 Apr 2024 07:41:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4397fJxB087795; Tue, 9 Apr 2024 07:41:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4397fJbw087793; Tue, 9 Apr 2024 07:41:19 GMT (envelope-from git) Date: Tue, 9 Apr 2024 07:41:19 GMT Message-Id: <202404090741.4397fJbw087793@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: 9f5fa23ba46b - main - math/cado-nfs: update 2.3.0-20240318 =?utf-8?Q?=E2=86=92?= 2.3.0-20240408 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f5fa23ba46b0565aa741f76329e7a75cc4784ac Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=9f5fa23ba46b0565aa741f76329e7a75cc4784ac commit 9f5fa23ba46b0565aa741f76329e7a75cc4784ac Author: Yuri Victorovich AuthorDate: 2024-04-09 06:22:51 +0000 Commit: Yuri Victorovich CommitDate: 2024-04-09 07:40:59 +0000 math/cado-nfs: update 2.3.0-20240318 → 2.3.0-20240408 --- math/cado-nfs/Makefile | 10 ++++----- math/cado-nfs/distinfo | 6 ++--- math/cado-nfs/files/fake-c++ | 2 -- math/cado-nfs/files/patch-config_fmt.cmake | 35 ------------------------------ 4 files changed, 7 insertions(+), 46 deletions(-) diff --git a/math/cado-nfs/Makefile b/math/cado-nfs/Makefile index 6f0fb0500462..34094d61e26a 100644 --- a/math/cado-nfs/Makefile +++ b/math/cado-nfs/Makefile @@ -1,6 +1,6 @@ PORTNAME= cado-nfs DISTVERSIONPREFIX= v -DISTVERSION= 2.3.0-20240318 +DISTVERSION= 2.3.0-20240408 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -13,6 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ bash:shells/bash LIB_DEPENDS= libecm.so:math/gmp-ecm \ + libfmt.so:devel/libfmt \ libgf2x.so:math/gf2x \ libgmp.so:math/gmp \ libhwloc.so:devel/hwloc2 @@ -22,18 +23,15 @@ USES= cmake:noninja compiler:c++11-lang gmake perl5 python shebangfix # noninja USE_GITLAB= yes GL_SITE= https://gitlab.inria.fr -GL_TAGNAME= a24829267c8e81f58d8c643c7c5be5e454ef106e +GL_TAGNAME= 58d113d3608e41378753cd949b077f7c80449279 SHEBANG_GLOB= *.py -MAKE_ENV+= WRKSRC=${WRKSRC} # for files/fake-c++: workaround for external libfmt getting into the build - CXXFLAGS_i386= -msse2 # workaround for error: always_inline function '_mm_setzero_si128' requires target feature 'sse2', but would be inlined into function 'gf2x_mul4' that is compiled without support for 'sse2' TEST_TARGET= check # 'test' does the same but is less verbose -BINARY_ALIAS= python3=${PYTHON_CMD} \ - c++=${FILESDIR}/fake-c++ # workaround for external libfmt getting into the build +BINARY_ALIAS= python3=${PYTHON_CMD} .include diff --git a/math/cado-nfs/distinfo b/math/cado-nfs/distinfo index 20ab254f5e74..841e745ad3bc 100644 --- a/math/cado-nfs/distinfo +++ b/math/cado-nfs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712522573 -SHA256 (cado-nfs-cado-nfs-a24829267c8e81f58d8c643c7c5be5e454ef106e_GL0.tar.gz) = 0af1c4ad0fd20caba7667cb9df3bcb999b7ea0bf7bb89bf3fd3c4b708d940cdb -SIZE (cado-nfs-cado-nfs-a24829267c8e81f58d8c643c7c5be5e454ef106e_GL0.tar.gz) = 4190790 +TIMESTAMP = 1712604812 +SHA256 (cado-nfs-cado-nfs-58d113d3608e41378753cd949b077f7c80449279_GL0.tar.gz) = 060ec6ea3278a236c1ef635dee022aa84ac3463d19116f609ad0734dd5cbf6e2 +SIZE (cado-nfs-cado-nfs-58d113d3608e41378753cd949b077f7c80449279_GL0.tar.gz) = 4190908 diff --git a/math/cado-nfs/files/fake-c++ b/math/cado-nfs/files/fake-c++ deleted file mode 100755 index 752550aedf5a..000000000000 --- a/math/cado-nfs/files/fake-c++ +++ /dev/null @@ -1,2 +0,0 @@ -# workaround for external libfmt getting into the buid -/usr/bin/c++ -I $WRKSRC/utils/embedded "$@" diff --git a/math/cado-nfs/files/patch-config_fmt.cmake b/math/cado-nfs/files/patch-config_fmt.cmake deleted file mode 100644 index 6686bf33f7c7..000000000000 --- a/math/cado-nfs/files/patch-config_fmt.cmake +++ /dev/null @@ -1,35 +0,0 @@ ---- config/fmt.cmake.orig 2024-04-07 21:30:28 UTC -+++ config/fmt.cmake -@@ -23,7 +23,7 @@ endif() - endif() - - # Try in three passes, otherwise cmake gets in the way... --find_path (FMT_INCDIR fmt/core.h HINTS ${FMT_INCDIR_HINTS} DOC "fmt headers" -+find_path (FMT_INCDIR fmt-invalid/core.h HINTS ${FMT_INCDIR_HINTS} DOC "fmt headers" - NO_DEFAULT_PATH - NO_SYSTEM_ENVIRONMENT_PATH - NO_CMAKE_PATH -@@ -32,19 +32,19 @@ if(NOT FMT_INCDIR) - NO_CMAKE_FIND_ROOT_PATH - ) - if(NOT FMT_INCDIR) --find_path (FMT_INCDIR fmt/core.h HINTS ${FMT_INCDIR_HINTS} DOC "fmt headers" -+find_path (FMT_INCDIR fmt-invalid/core.h HINTS ${FMT_INCDIR_HINTS} DOC "fmt headers" - NO_DEFAULT_PATH - ) - endif() - if(NOT FMT_INCDIR) --find_path (FMT_INCDIR fmt/core.h HINTS ${FMT_INCDIR_HINTS} DOC "fmt headers") -+find_path (FMT_INCDIR fmt-invalid/core.h HINTS ${FMT_INCDIR_HINTS} DOC "fmt headers") - endif() - --find_library(FMT_LIB fmt HINTS ${FMT_LIBDIR_HINTS} DOC "fmt library" -+find_library(FMT_LIB fmt-invalid HINTS ${FMT_LIBDIR_HINTS} DOC "fmt library" - NO_DEFAULT_PATH - ) - if(NOT FMT_LIB) --find_library(FMT_LIB fmt HINTS ${FMT_LIBDIR_HINTS} DOC "fmt library") -+find_library(FMT_LIB fmt-invalid HINTS ${FMT_LIBDIR_HINTS} DOC "fmt library") - endif() - -