givaro: fix cross build
This commit is contained in:
parent
4534205b61
commit
45a2b054e6
@ -44,6 +44,8 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/linbox-team/givaro/commit/a18baf5227d4f3e81a50850fe98e0d954eaa3ddb.patch";
|
||||
hash = "sha256-IR0IHhCqbxgtsST30vxM9ak1nGtt0apxcLUQ1kS1DHw=";
|
||||
})
|
||||
# skip gmp version check for cross-compiling, our version is new enough
|
||||
./skip-gmp-check.patch
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@ -59,6 +61,7 @@ stdenv.mkDerivation rec {
|
||||
configureFlags =
|
||||
[
|
||||
"--without-archnative"
|
||||
"CCNAM=${stdenv.cc.cc.pname}"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isx86_64 [
|
||||
# disable SIMD instructions (which are enabled *when available* by default)
|
||||
|
||||
26
pkgs/development/libraries/givaro/skip-gmp-check.patch
Normal file
26
pkgs/development/libraries/givaro/skip-gmp-check.patch
Normal file
@ -0,0 +1,26 @@
|
||||
diff --git a/macros/gmp-check.m4 b/macros/gmp-check.m4
|
||||
index 72eba8c..25af64e 100644
|
||||
--- a/macros/gmp-check.m4
|
||||
+++ b/macros/gmp-check.m4
|
||||
@@ -105,21 +105,6 @@ AC_DEFUN([GIV_CHECK_GMP], [
|
||||
exit 1
|
||||
])
|
||||
|
||||
- AC_MSG_CHECKING([whether gmp version is at least $min_gmp_release])
|
||||
- AC_TRY_RUN(
|
||||
- [
|
||||
- #include <cstddef>
|
||||
- #include <gmp.h>
|
||||
- int main () {
|
||||
- return (__GNU_MP_RELEASE < $min_gmp_release);
|
||||
- }
|
||||
- ],
|
||||
- [ AC_MSG_RESULT(yes)
|
||||
- ],
|
||||
- [ AC_MSG_RESULT(no)
|
||||
- AC_MSG_ERROR(your GMP is too old. GMP release >= $min_gmp_release needed)
|
||||
- exit 1]
|
||||
- )
|
||||
AC_LANG_POP([C++])
|
||||
|
||||
AC_SUBST(GMP_CFLAGS)
|
||||
Loading…
x
Reference in New Issue
Block a user