Unverified Commit d1c244fe authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

givaro: fix cross build, add meta.homepage (#394461)

parents 2b82ae08 96f28a6f

pkgs/development/libraries/givaro/default.nix

+8 −2
Original line number Diff line number Diff line
@@ -12,12 +12,14 @@ 
stdenv.mkDerivation rec {

  pname = "givaro";

  version = "4.2.0";



  src = fetchFromGitHub {

    owner = "linbox-team";

    repo = pname;

    rev = "v${version}";

    repo = "givaro";

    tag = "v${version}";

    sha256 = "sha256-KR0WJc0CSvaBnPRott4hQJhWNBb/Wi6MIhcTExtVobQ=";

  };



  patches = [

    # Pull upstream fix for gcc-13:

    #   https://github.com/linbox-team/givaro/pull/218
@@ -44,6 +46,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 +63,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)
@@ -80,6 +85,7 @@ stdenv.mkDerivation rec { 


  meta = {

    description = "C++ library for arithmetic and algebraic computations";

    homepage = "https://casys.gricad-pages.univ-grenoble-alpes.fr/givaro/";

    mainProgram = "givaro-config";

    license = lib.licenses.cecill-b;

    maintainers = [ lib.maintainers.raskin ];

pkgs/development/libraries/givaro/skip-gmp-check.patch

0 → 100644
+26 −0
Original line number Diff line number Diff line 
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)