Skip to content

Commit ab3952b

Browse files
author
Release Manager
committed
gh-38910: Meson: minor revision <!-- ^ Please provide a concise and informative title. --> <!-- ^ Don't put issue numbers in the title, do this in the PR description below. --> <!-- ^ For example, instead of "Fixes #12345" use "Introduce new method to calculate 1 + 2". --> <!-- v Describe your changes below in detail. --> <!-- v Why is this change required? What problem does it solve? --> <!-- v If this PR resolves an open issue, please link to it here. For example, "Fixes #12345". --> A bit of a minor cleanup of the meson build files. Extracted from #38872. ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [ ] The title is concise and informative. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation and checked the documentation preview. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - #12345: short description why this is a dependency --> <!-- - #34567: ... --> URL: #38910 Reported by: Tobias Diez Reviewer(s): Michael Orlitzky
2 parents 5c8186c + ea86281 commit ab3952b

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@ build-install
312312
build/cp*
313313

314314
# Meson temporary files
315+
subprojects/wrapdb.json
315316
src/sage/interfaces/__init__.py
316317
src/sage/crypto/block_cipher/__init__.py
317318
src/sage/crypto/public_key/__init__.py

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ endif
3535

3636
# Workaround for missing init files (Cython doesn't handle namespace packages well)
3737
create_files_command = [
38-
'python3',
38+
py,
3939
'-c',
4040
'''
4141
import os

src/meson.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ blas_order += ['cblas', 'openblas', 'OpenBLAS', 'flexiblas', 'blis', 'blas']
8080
blas = dependency(blas_order)
8181
gsl = dependency(
8282
'gsl',
83-
fallback: ['gsl', 'gsl_dep'],
8483
version: '>=2.5',
8584
required: true,
8685
)

src/sage/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ conf_data = configuration_data()
66
conf_data.set('PACKAGE_VERSION', '1.2.3')
77
conf_data.set('SAGE_ROOT', meson.current_source_dir() / '..' / '..')
88
# We use Python's prefix here to make it work with conda
9-
prefix = py.get_variable('prefix', '')
9+
prefix = fs.as_posix(py.get_variable('prefix', ''))
1010
conf_data.set('prefix', prefix)
1111
datadir = fs.expanduser(get_option('datadir'))
1212
if not fs.is_absolute(datadir)
@@ -56,7 +56,7 @@ ecm_bin = find_program(['ecm', 'gmp-ecm'], required: true)
5656
conf_data.set('SAGE_ECMBIN', ecm_bin.full_path())
5757

5858
config_file = configure_file(
59-
input: '../../pkgs/sage-conf_conda/_sage_conf/_conf.py.in',
59+
input: '../../pkgs/sage-conf/_sage_conf/_conf.py.in',
6060
output: 'config.py',
6161
install_dir: py.get_install_dir() / 'sage',
6262
install: true,

0 commit comments

Comments
 (0)