From nobody Sun Apr 07 23:45:56 2024 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 4VCTPd0q3gz5FYnn; Sun, 7 Apr 2024 23:45:57 +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 4VCTPd0HcXz48tx; Sun, 7 Apr 2024 23:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712533557; 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=XQj3PPdYffpZ2uH3w40dE1dtbvvSErt4NH89kT8q9Bs=; b=lrKYOq/Ryqmut2nV4jkCmoYvrFK1+s0VAAKtnyLWHZ3ogKu6AGawKxympI818nrDUe49tD aJtP+EfmMU50RkhqaTo0wSuddyCjh0bFAT6AEs4uRq/cZYVIDBVNG7sRwf4mDd81uvIMvz RI5kkWX5IFxGmF+BYIkjpvdFjyY3OieXRzWZs0dSQLeyBK1JCAM/IboNSXLQwZeIspfKY1 AslUzt2HS/3iHR78K34UdVxPYs/lxXkv7hv2wCPhJPBMiDkSKTlis3Se4bXRDA/ofuFE+b droauY7djp85YQu/2vJNiYvap+ikmTwAVxtkXiAEB0RjyA8BmbKJo3re712G2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712533557; a=rsa-sha256; cv=none; b=iT15Cknp2gBei4SVE7qtp6+34g7A4dp4+WoBq5ucNN/Gc6VHaaBiY7CxRjsjwAZcq7dRG6 yh0nGBNKxztBKvjMzGEH8NzWtetX8ifOKSb6WmUmlkjEHYDzhpf3E57VDj3NrnZ5A9rlzs GeqasAIY83W3s/ut+jzI5WzlJ3xW5e0DeAjFwdJkd+xYCUKKQcghYZRIOSXM5gZK5kXsug IQ4G4zwAICigT2ev2pfYEBTvn8WSjmW6YRAGWMECKUlXwpbPZw8c37HQOmPkCdopkRBv2V am/3Ufn0hZsrkWa1DGogtB2gUBKvw7UDftPNnWGOPoxu7n0lGSqM0y2MLdEe8w== 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=1712533557; 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=XQj3PPdYffpZ2uH3w40dE1dtbvvSErt4NH89kT8q9Bs=; b=ua9Ib1kmHL9Xj6rCBX3AV4b/GeOiqmFpR5W8ekZf/D/Qlcp7qUtQgL5V+HDXB5Z+sQ4DRP LhXvw1PM5fUJGsp1C7/VkNZ/J8+QQpMvVL8JJU8cv0xOj0JhO/k9ng+hUgmAa3bKL+sJBg eEv+Gsz8khu2poNDilHq6lDZRUT8QiGx6s8Tq7utvsxhrx6kDM5yCz2Y4+leTID6rigZpi jWmbXPppDmZhOtEYCxN+Gd1gz+kEAyMwaQFem/Jp06iLH+5bRi22KM29MfI77lYFgYJ+UC vvcfkxlOtHocA0FOXHmxyfB7Jj2EcYosHpnNBYP5YHStzdQ4FZ0cNItRmQbTgQ== 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 4VCTPc70fmzpGJ; Sun, 7 Apr 2024 23:45:56 +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 437NjuhI020228; Sun, 7 Apr 2024 23:45:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437NjuhZ020225; Sun, 7 Apr 2024 23:45:56 GMT (envelope-from git) Date: Sun, 7 Apr 2024 23:45:56 GMT Message-Id: <202404072345.437NjuhZ020225@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: 9f9312681743 - main - math/cado-nfs: update 2.3.0-20220722 =?utf-8?Q?=E2=86=92?= 2.3.0-20240318 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 9f93126817439da8a405d15715eadb883d85b4be Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=9f93126817439da8a405d15715eadb883d85b4be commit 9f93126817439da8a405d15715eadb883d85b4be Author: Yuri Victorovich AuthorDate: 2024-04-07 23:18:52 +0000 Commit: Yuri Victorovich CommitDate: 2024-04-07 23:45:53 +0000 math/cado-nfs: update 2.3.0-20220722 → 2.3.0-20240318 Also add workaround for the build breakage caused by the conflict with the pre-installed libfmt. --- math/cado-nfs/Makefile | 11 +++++----- math/cado-nfs/distinfo | 6 ++--- math/cado-nfs/files/fake-c++ | 2 ++ math/cado-nfs/files/patch-CMakeLists.txt | 28 ++++++++++++------------ math/cado-nfs/files/patch-config_fmt.cmake | 35 ++++++++++++++++++++++++++++++ math/cado-nfs/pkg-plist | 12 +++++++++- 6 files changed, 71 insertions(+), 23 deletions(-) diff --git a/math/cado-nfs/Makefile b/math/cado-nfs/Makefile index f0ffd582f39d..6f0fb0500462 100644 --- a/math/cado-nfs/Makefile +++ b/math/cado-nfs/Makefile @@ -1,6 +1,6 @@ PORTNAME= cado-nfs DISTVERSIONPREFIX= v -DISTVERSION= 2.3.0-20220722 +DISTVERSION= 2.3.0-20240318 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -10,8 +10,6 @@ WWW= https://cado-nfs.gitlabpages.inria.fr/ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS_BUILD= libfmt # bundled libfmt conflicts with package-installed headers - BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ bash:shells/bash LIB_DEPENDS= libecm.so:math/gmp-ecm \ @@ -24,15 +22,18 @@ USES= cmake:noninja compiler:c++11-lang gmake perl5 python shebangfix # noninja USE_GITLAB= yes GL_SITE= https://gitlab.inria.fr -GL_TAGNAME= 3ab6a4781fa5d218ed332834809ba6c6fd1a591f +GL_TAGNAME= a24829267c8e81f58d8c643c7c5be5e454ef106e 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} +BINARY_ALIAS= python3=${PYTHON_CMD} \ + c++=${FILESDIR}/fake-c++ # workaround for external libfmt getting into the build .include diff --git a/math/cado-nfs/distinfo b/math/cado-nfs/distinfo index 390cf1398a06..20ab254f5e74 100644 --- a/math/cado-nfs/distinfo +++ b/math/cado-nfs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1658477035 -SHA256 (cado-nfs-cado-nfs-3ab6a4781fa5d218ed332834809ba6c6fd1a591f_GL0.tar.gz) = 8f93d56f0cfef0693110882509365da192fc1ebd52307af3a1a763e0fb068fea -SIZE (cado-nfs-cado-nfs-3ab6a4781fa5d218ed332834809ba6c6fd1a591f_GL0.tar.gz) = 4742485 +TIMESTAMP = 1712522573 +SHA256 (cado-nfs-cado-nfs-a24829267c8e81f58d8c643c7c5be5e454ef106e_GL0.tar.gz) = 0af1c4ad0fd20caba7667cb9df3bcb999b7ea0bf7bb89bf3fd3c4b708d940cdb +SIZE (cado-nfs-cado-nfs-a24829267c8e81f58d8c643c7c5be5e454ef106e_GL0.tar.gz) = 4190790 diff --git a/math/cado-nfs/files/fake-c++ b/math/cado-nfs/files/fake-c++ new file mode 100755 index 000000000000..752550aedf5a --- /dev/null +++ b/math/cado-nfs/files/fake-c++ @@ -0,0 +1,2 @@ +# workaround for external libfmt getting into the buid +/usr/bin/c++ -I $WRKSRC/utils/embedded "$@" diff --git a/math/cado-nfs/files/patch-CMakeLists.txt b/math/cado-nfs/files/patch-CMakeLists.txt index 674ac4812f6a..136353b09f71 100644 --- a/math/cado-nfs/files/patch-CMakeLists.txt +++ b/math/cado-nfs/files/patch-CMakeLists.txt @@ -1,8 +1,8 @@ - workaround for the failure: error: variable 'total_weight' set but not used [-Werror,-Wunused-but-set-variable] ---- CMakeLists.txt.orig 2022-01-31 23:16:04 UTC +--- CMakeLists.txt.orig 2024-03-18 08:56:37 UTC +++ CMakeLists.txt -@@ -146,7 +146,7 @@ if(CMAKE_COMPILER_IS_GNUCC) +@@ -149,7 +149,7 @@ if(CMAKE_COMPILER_IS_GNUCC) # prevents the definition of __STRICT_ANSI__ # # Ditto for C++, with the c++98/gnu++98 subtlety. @@ -11,7 +11,7 @@ if (MINGW) set (CMAKE_C_FLAGS "-std=gnu99 ${CMAKE_C_FLAGS}") else() -@@ -156,7 +156,7 @@ if(CMAKE_COMPILER_IS_GNUCC) +@@ -159,7 +159,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") endif() if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") @@ -20,9 +20,9 @@ if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) message(FATAL_ERROR "cado-nfs requires gcc version 5 or greater") endif() -@@ -187,8 +187,8 @@ endif() - - if(CMAKE_C_COMPILER_ID MATCHES "Intel") +@@ -201,8 +201,8 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Intel") + message(STATUS "Enabling C++11 support") + elseif(CMAKE_C_COMPILER_ID MATCHES "Intel") message(STATUS "Applying flags for icc") - set (CMAKE_C_FLAGS "-W -Wall -wd13200,13203 ${CMAKE_C_FLAGS}") - set (CMAKE_CXX_FLAGS "-W -Wall -wd13200,13203,3058 ${CMAKE_CXX_FLAGS}") @@ -31,7 +31,7 @@ set (CMAKE_C_FLAGS "-std=c99 ${CMAKE_C_FLAGS}") # only icc>=15 is full c++11 compliant, it seems. But 14 will do. -@@ -206,7 +206,7 @@ endif() +@@ -220,7 +220,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "AppleClang" OR CMAKE_H if(CMAKE_C_COMPILER_ID MATCHES "AppleClang" OR CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_C_COMPILER_ID MATCHES "Clang" ) @@ -40,12 +40,12 @@ endif() if(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang" OR CMAKE_HOST_SYSTEM_NAME -@@ -226,7 +226,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "^Clang") - set (CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}") - set (HAVE_CXX11 1) +@@ -232,7 +232,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "^Clang") message(STATUS "Enabling C++11 support") -- set (CMAKE_CXX_FLAGS "-std=c++11 -W -Wall ${CMAKE_CXX_FLAGS}") -+ set (CMAKE_CXX_FLAGS "-std=c++11 -W ${CMAKE_CXX_FLAGS}") endif() - endif() - message(STATUS "CFLAGS=${CMAKE_C_FLAGS} (synthetized)") + elseif(CMAKE_CXX_COMPILER_ID MATCHES "^Clang") +- set (CMAKE_CXX_FLAGS "-W -Wall ${CMAKE_CXX_FLAGS}") ++ set (CMAKE_CXX_FLAGS "-W ${CMAKE_CXX_FLAGS}") + # According to http://clang.llvm.org/cxx_status.html + # Caveat: Apple's clang identifies itself as plain Clang on some + # occasions... I don't exactly know when and how, but there's some diff --git a/math/cado-nfs/files/patch-config_fmt.cmake b/math/cado-nfs/files/patch-config_fmt.cmake new file mode 100644 index 000000000000..6686bf33f7c7 --- /dev/null +++ b/math/cado-nfs/files/patch-config_fmt.cmake @@ -0,0 +1,35 @@ +--- 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() + + diff --git a/math/cado-nfs/pkg-plist b/math/cado-nfs/pkg-plist index a1a36740ee5b..527018e58d0c 100644 --- a/math/cado-nfs/pkg-plist +++ b/math/cado-nfs/pkg-plist @@ -18,8 +18,8 @@ lib/cado-nfs-3.0.0/linalg/bwc/cleanup lib/cado-nfs-3.0.0/linalg/bwc/dispatch lib/cado-nfs-3.0.0/linalg/bwc/gather lib/cado-nfs-3.0.0/linalg/bwc/krylov +lib/cado-nfs-3.0.0/linalg/bwc/lingen_b64 %%LINGEN_PZ%%lib/cado-nfs-3.0.0/linalg/bwc/lingen_pz -lib/cado-nfs-3.0.0/linalg/bwc/lingen_u64k1 lib/cado-nfs-3.0.0/linalg/bwc/mf_bal lib/cado-nfs-3.0.0/linalg/bwc/mksol lib/cado-nfs-3.0.0/linalg/bwc/prep @@ -114,10 +114,15 @@ lib/cado-nfs-3.0.0/utils/numbertheory_tool %%DATADIR%%-3.0.0/factor/params.c130 %%DATADIR%%-3.0.0/factor/params.c135 %%DATADIR%%-3.0.0/factor/params.c140 +%%DATADIR%%-3.0.0/factor/params.c143 %%DATADIR%%-3.0.0/factor/params.c145 +%%DATADIR%%-3.0.0/factor/params.c148 %%DATADIR%%-3.0.0/factor/params.c150 +%%DATADIR%%-3.0.0/factor/params.c153 %%DATADIR%%-3.0.0/factor/params.c155 +%%DATADIR%%-3.0.0/factor/params.c158 %%DATADIR%%-3.0.0/factor/params.c160 +%%DATADIR%%-3.0.0/factor/params.c163 %%DATADIR%%-3.0.0/factor/params.c165 %%DATADIR%%-3.0.0/factor/params.c170 %%DATADIR%%-3.0.0/factor/params.c175 @@ -154,10 +159,15 @@ lib/cado-nfs-3.0.0/utils/numbertheory_tool %%DATADIR%%-3.0.0/polynomials/c130.poly %%DATADIR%%-3.0.0/polynomials/c135.poly %%DATADIR%%-3.0.0/polynomials/c140.poly +%%DATADIR%%-3.0.0/polynomials/c143.poly %%DATADIR%%-3.0.0/polynomials/c145.poly +%%DATADIR%%-3.0.0/polynomials/c148.poly %%DATADIR%%-3.0.0/polynomials/c150.poly +%%DATADIR%%-3.0.0/polynomials/c153.poly %%DATADIR%%-3.0.0/polynomials/c155.poly +%%DATADIR%%-3.0.0/polynomials/c158.poly %%DATADIR%%-3.0.0/polynomials/c160.poly +%%DATADIR%%-3.0.0/polynomials/c163.poly %%DATADIR%%-3.0.0/polynomials/c165.poly %%DATADIR%%-3.0.0/polynomials/c170.poly %%DATADIR%%-3.0.0/polynomials/c175.poly