diff --git a/gnu/local.mk b/gnu/local.mk index ab877a6c0b..395839cec2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1802,7 +1802,6 @@ dist_patch_DATA = \ %D%/packages/patches/lierolibre-remove-arch-warning.patch \ %D%/packages/patches/lierolibre-try-building-other-arch.patch \ %D%/packages/patches/libcdio-glibc-compat.patch \ - %D%/packages/patches/linbox-fix-pkgconfig.patch \ %D%/packages/patches/linphone-desktop-without-sdk.patch \ %D%/packages/patches/linux-libre-infodocs-target.patch \ %D%/packages/patches/linux-libre-support-for-Pinebook-Pro.patch \ diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index bcf61941e3..f8f05ff222 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1591,7 +1591,7 @@ algebra, such as the row echelon form.") (define-public linbox (package (name "linbox") - (version "1.6.3") + (version "1.7.0") (source (origin (method git-fetch) (uri (git-reference @@ -1600,8 +1600,7 @@ algebra, such as the row echelon form.") (file-name (git-file-name name version)) (sha256 (base32 - "10j6dspbsq7d2l4q3y0c1l1xwmaqqba2fxg59q5bhgk9h5d7q571")) - (patches (search-patches "linbox-fix-pkgconfig.patch")))) + "0kr95ah0ss5s4j8kwxqlg395wraf32rdrmy83jfblg0avxmkhvwr")))) (build-system gnu-build-system) (native-inputs (list autoconf automake libtool pkg-config)) diff --git a/gnu/packages/patches/linbox-fix-pkgconfig.patch b/gnu/packages/patches/linbox-fix-pkgconfig.patch deleted file mode 100644 index c93915fb1b..0000000000 --- a/gnu/packages/patches/linbox-fix-pkgconfig.patch +++ /dev/null @@ -1,23 +0,0 @@ -Backported from: - -From 426eb97ba762c7663884f57ead0909f2aa3cd6a5 Mon Sep 17 00:00:00 2001 -From: Cyril Bouvier -Date: Thu, 17 Jan 2019 16:32:19 +0100 -Subject: [PATCH] Remove @LINBOXSAGE_LIBS@ from linbox.pc.in - ---- - linbox.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/linbox.pc.in b/linbox.pc.in -index 278f127e4..c6b8091eb 100644 ---- a/linbox.pc.in -+++ b/linbox.pc.in -@@ -9,6 +9,6 @@ Description: Exact Linear Algebra library - URL: http://github.com/linbox-team/linbox - Version: @VERSION@ - Requires: fflas-ffpack >= 2.4.0, givaro >= 4.1.0 --Libs: -L${libdir} -llinbox @LINBOXSAGE_LIBS@ @NTL_LIBS@ @MPFR_LIBS@ @FPLLL_LIBS@ @IML_LIBS@ @FLINT_LIBS@ @OCL_LIBS@ -+Libs: -L${libdir} -llinbox @NTL_LIBS@ @MPFR_LIBS@ @FPLLL_LIBS@ @IML_LIBS@ @FLINT_LIBS@ @OCL_LIBS@ - Cflags: @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR -I${includedir} @NTL_CFLAGS@ @MPFR_CFLAGS@ @FPLLL_CFLAGS@ @IML_CFLAGS@ @FLINT_CFLAGS@ - \-------------------------------------------------------