Merge branch 'meson-compile' into meson-ci-tests

tobiasdiez · Feb 22, 2024 · 1a439e6 · 1a439e6
2 parents 4cf639a + b578c77
commit 1a439e6
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 35 deletions.
diff --git a/src/sage/graphs/graph_decompositions/meson.build b/src/sage/graphs/graph_decompositions/meson.build
@@ -1,10 +1,6 @@
 tdlib = cc.find_library('tdlib', required: false)
 # Cannot be found via pkg-config
-rw = declare_dependency(
-  dependencies: [
-    cc.find_library('rw'),
-  ]
-)
+rw = cc.find_library('rw')
 
 py.install_sources(
   'all.py',

diff --git a/src/sage/graphs/meson.build b/src/sage/graphs/meson.build
@@ -3,11 +3,8 @@ mcqd = cc.find_library('mcqd', required: false)
 cliquer = cc.find_library('cliquer')
 
 # Cannot be found via pkg-config
-planarity = declare_dependency(
-  dependencies: [
-    cc.find_library('planarity'),
-  ]
-)
+planarity = cc.find_library('planarity')
+
 py.install_sources(
   'all.py',
   'all__sagemath_bliss.py',

diff --git a/src/sage/libs/giac/meson.build b/src/sage/libs/giac/meson.build
@@ -1,8 +1,4 @@
-giac = declare_dependency(
-  dependencies: [
-    cc.find_library('giac', required: false),
-  ]
-)
+giac = cc.find_library('giac', required: false)
 
 py.install_sources('__init__.py', 'giac.pxd', 'misc.h', subdir : 'sage/libs/giac')
 

diff --git a/src/sage/libs/meson.build b/src/sage/libs/meson.build
@@ -1,8 +1,4 @@
-sirocco = declare_dependency(
-  dependencies: [
-    cc.find_library('sirocco', required: false),
-  ]
-)
+sirocco = cc.find_library('sirocco', required: false)
 # cannot be found via pkg-config
 ecl = cc.find_library('ecl')
 

diff --git a/src/sage/libs/symmetrica/meson.build b/src/sage/libs/symmetrica/meson.build
@@ -1,9 +1,5 @@
 # Cannot be found by pkg-config
-symmetrica = declare_dependency(
-  dependencies: [
-    cc.find_library('symmetrica'),
-  ]
-)
+symmetrica = cc.find_library('symmetrica')
 
 py.install_sources('__init__.py', 'all.py', subdir : 'sage/libs/symmetrica')
 

diff --git a/src/sage/rings/meson.build b/src/sage/rings/meson.build
@@ -1,8 +1,4 @@
-pthread = declare_dependency(
-  dependencies: [
-    cc.find_library('pthread'),
-  ]
-)
+pthread = cc.find_library('pthread')
 
 py.install_sources(
   '__init__.py',

diff --git a/src/sage/rings/polynomial/pbori/meson.build b/src/sage/rings/polynomial/pbori/meson.build
@@ -1,8 +1,4 @@
-brial = declare_dependency(
-  dependencies: [
-    cc.find_library('brial', required: false),
-  ]
-)
+brial = cc.find_library('brial', required: false)
 # Cannot be found via pkg-config
 brial_groebner = cc.find_library('brial_groebner')
 

diff --git a/src/sage/structure/meson.build b/src/sage/structure/meson.build
@@ -60,12 +60,23 @@ extension_data = {
 }
 
 foreach name, pyx : extension_data
+    if name == 'element'
+      # Compile this with -Os because it works around a bug with
+      # GCC-4.7.3 + Cython 0.19 on Itanium, see Issue #14452. Moreover, it
+      # actually results in faster code than -O3.
+      # It's also needed to generate proper OverflowError (see Issue 2956)
+      extra_cflags = ['-Os']
+    else
+      extra_cflags = []
+    endif
+
     py.extension_module(name,
         sources: pyx,
         subdir: 'sage/structure',
         install: true,
         include_directories: [inc_cpython, inc_ext, inc_rings],
         dependencies: [py_dep, cysignals, gmp, gmpy2, mpc, mpfr],
+        c_args: extra_cflags,
     )
 endforeach