summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimone Cimarelli2022-09-23 19:59:04 +0200
committerSimone Cimarelli2022-09-23 20:11:42 +0200
commitadf48b77d879e2e53e22f3ffd28c0897512b7720 (patch)
treebfc9ec167e189706123b86bd576971cf5ad30029
parent9703866943289673613447691b7680546c3d410c (diff)
downloadaur-adf48b77d879e2e53e22f3ffd28c0897512b7720.tar.gz
Add patch to ignore system fmt library
-rw-r--r--PKGBUILD10
-rw-r--r--fmt.patch13
2 files changed, 21 insertions, 2 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 2bea22180232..d64901d8ffc2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,8 +19,10 @@ optdepends=('curl: for cado-nfs-client.py'
'perl: for bwc.pl')
conflicts=('cado-nfs')
provides=('cado-nfs')
-source=("git+https://gitlab.inria.fr/cado-nfs/${_pkg}.git")
-md5sums=('SKIP')
+source=("git+https://gitlab.inria.fr/cado-nfs/${_pkg}.git"
+ fmt.patch)
+md5sums=('SKIP'
+ '4e8d87c0205c40cf6be6c946e2062e1b')
# Need -march for SIMD support. Makes the resulting package less portable.
_march=native
@@ -43,6 +45,10 @@ pkgver() {
git log -1 --format="%cd.%h" --date=short | sed 's/-//g'
}
+prepare() {
+ patch -d "$_pkg" -p1 < fmt.patch
+}
+
build() {
cd "$_pkg"
diff --git a/fmt.patch b/fmt.patch
new file mode 100644
index 000000000000..4a5536903255
--- /dev/null
+++ b/fmt.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 983449a7a..7e94e44d6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -330,7 +330,7 @@ include("${CADO_NFS_SOURCE_DIR}/config/test-rand.cmake")
+ include("${CADO_NFS_SOURCE_DIR}/config/strlcpy.cmake")
+ include("${CADO_NFS_SOURCE_DIR}/config/linux.cmake")
+ include("${CADO_NFS_SOURCE_DIR}/config/hwloc.cmake")
+-include("${CADO_NFS_SOURCE_DIR}/config/fmt.cmake")
++#include("${CADO_NFS_SOURCE_DIR}/config/fmt.cmake")
+ include("${CADO_NFS_SOURCE_DIR}/config/gmpecm.cmake")
+ IF (NOT DEFINED ENV{NO_PYTHON_CHECK})
+ include("${CADO_NFS_SOURCE_DIR}/config/python.cmake")