Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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.
- Loading branch information
Showing
6 changed files
with
71 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
# workaround for external libfmt getting into the buid | ||
/usr/bin/c++ -I $WRKSRC/utils/embedded "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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() | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters