From 8ab64d8a6cad79f143f136f40cc0cc3e10a23671 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Fri, 21 Feb 2025 23:45:44 +0100 Subject: [PATCH] Meson: Remove unused build dependencies ppl and fplll --- pyproject.toml | 5 ++--- src/meson.build | 3 --- src/sage/libs/linbox/meson.build | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 117a5006067..8265d6c8739 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -113,7 +113,6 @@ host-requires = [ "pkg:generic/eclib", "pkg:generic/ecm", "pkg:generic/fflas-ffpack", - "pkg:generic/fplll", "pkg:generic/flint", "pkg:generic/libgd", "pkg:generic/gap", @@ -143,7 +142,6 @@ host-requires = [ "pkg:generic/pari-galdata", "pkg:generic/pari-seadata", "pkg:generic/planarity", - "pkg:generic/ppl", "pkg:generic/primesieve", "pkg:generic/primecount", "pkg:generic/qhull", @@ -154,10 +152,11 @@ host-requires = [ ] dependencies = [ - "pkg:generic/tachyon", + "pkg:generic/ppl", "pkg:generic/sagemath-polytopes-db", "pkg:generic/sagemath-elliptic-curves", "pkg:generic/sagemath-graphs", + "pkg:generic/tachyon", ] [dependency-groups] diff --git a/src/meson.build b/src/meson.build index fb22b2cec22..ddd2a82d047 100644 --- a/src/meson.build +++ b/src/meson.build @@ -101,11 +101,8 @@ zlib = dependency('zlib', version: '>=1.2.11') ec = dependency('eclib', version: '>=20231211') # Cannot be found via pkg-config ecm = cc.find_library('ecm') -# Cannot be found via pkg-config -ppl = cc.find_library('ppl') gmpxx = dependency('gmpxx') fflas = dependency('fflas-ffpack', version: '>=2.5.0') -fplll = dependency('fplll') givaro = dependency('givaro', version: '>=4.2.0') linbox = dependency('linbox', required: false, version: '>=1.7.0') if not linbox.found() diff --git a/src/sage/libs/linbox/meson.build b/src/sage/libs/linbox/meson.build index 252a6ae0f9e..cd5f17d9f03 100644 --- a/src/sage/libs/linbox/meson.build +++ b/src/sage/libs/linbox/meson.build @@ -20,7 +20,7 @@ foreach name, pyx : extension_data_cpp install: true, override_options: ['cython_language=cpp'], include_directories: [inc_flint], - dependencies: [py_dep, blas, flint, fplll, givaro, gmp, gmpxx, linbox], + dependencies: [py_dep, blas, flint, givaro, gmp, gmpxx, linbox], ) endforeach