Fix a few more runtime errors

tobiasdiez · Nov 14, 2023 · 310975e · 310975e
1 parent dec2e02
commit 310975e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/src/sage/geometry/__init__.py b/src/sage/geometry/__init__.py
@@ -0,0 +1 @@
+# Here so that cython creates the correct module name
diff --git a/src/sage/geometry/polyhedron/__init__.py b/src/sage/geometry/polyhedron/__init__.py
@@ -0,0 +1 @@
+# Here so that cython creates the correct module name
diff --git a/src/sage/geometry/polyhedron/combinatorial_polyhedron/__init__.py b/src/sage/geometry/polyhedron/combinatorial_polyhedron/__init__.py
@@ -0,0 +1 @@
+# Here so that cython creates the correct module name
diff --git a/src/sage/libs/eclib/meson.build b/src/sage/libs/eclib/meson.build
@@ -20,7 +20,7 @@ foreach name, pyx : extension_data_cpp
         install: true,
         override_options : ['cython_language=cpp'],
         include_directories: [inc_cpython, inc_ext, inc_flint, inc_ntl, inc_rings],
-        dependencies: [py_dep, cysignals, flint, gmp, ec],
+        dependencies: [py_dep, cysignals, ec, flint, gmp],
     )
 endforeach
 
diff --git a/src/sage/libs/meson.build b/src/sage/libs/meson.build
@@ -3,6 +3,9 @@ sirocco = declare_dependency(
     cc.find_library('sirocco', required: false),
   ]
 )
+# cannot be found via pkg-config
+ecl = cc.find_library('ecl')
+
 py.install_sources(
     'all.py',
     'all__sagemath_coxeter3.py',
@@ -19,7 +22,7 @@ extension_data = {
     #'meataxe': files('meataxe.pyx'), # not yet on conda - need meataxe
 }
 
-dependencies = [py_dep, braiding, cysignals, ecm, gc, gmp, homfly, mtx, sirocco]
+dependencies = [py_dep, braiding, cysignals, ecl, ecm, gc, gmp, homfly, mtx, sirocco]
 
 if sirocco.found()
     #extension_data['sirocco'] += files('sirocco.pxd') # not yet on conda

diff --git a/src/sage/modular/arithgroup/meson.build b/src/sage/modular/arithgroup/meson.build
@@ -1,3 +1,4 @@
+inc_farey = include_directories('.')
 py.install_sources(
     'all.py',
     'arithgroup_generic.py',
@@ -22,7 +23,7 @@ foreach name, pyx : extension_data
         sources: pyx,
         subdir: 'sage/modular/arithgroup',
         install: true,
-        include_directories: [inc_cpython, inc_ext, inc_flint, inc_rings],
+        include_directories: [inc_cpython, inc_ext, inc_farey, inc_flint, inc_rings],
         dependencies: [py_dep, cysignals, flint, gmp],
     )
 endforeach
@@ -37,7 +38,7 @@ foreach name, pyx : extension_data_cpp
         subdir: 'sage/modular/arithgroup',
         install: true,
         override_options : ['cython_language=cpp'],
-        include_directories: [inc_cpython, inc_ext, inc_flint, inc_rings],
+        include_directories: [inc_cpython, inc_ext, inc_farey, inc_flint, inc_rings],
         dependencies: [py_dep, cysignals, flint, gmp],
     )
 endforeach