Skip to content

Commit

Permalink
sagemathgh-38910: Meson: minor revision
Browse files Browse the repository at this point in the history
    
<!-- ^ 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 sagemath#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 sagemath#12345". -->

A bit of a minor cleanup of the meson build files. Extracted from
sagemath#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,
-->
<!-- - sagemath#12345: short description why this is a dependency -->
<!-- - sagemath#34567: ... -->
    
URL: sagemath#38910
Reported by: Tobias Diez
Reviewer(s): Michael Orlitzky
  • Loading branch information
Release Manager committed Nov 9, 2024
2 parents dbf920a + ea86281 commit 09d1d69
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ build-install
build/cp*

# Meson temporary files
subprojects/wrapdb.json
src/sage/interfaces/__init__.py
src/sage/crypto/block_cipher/__init__.py
src/sage/crypto/public_key/__init__.py
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ endif

# Workaround for missing init files (Cython doesn't handle namespace packages well)
create_files_command = [
'python3',
py,
'-c',
'''
import os
Expand Down
1 change: 0 additions & 1 deletion src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ blas_order += ['cblas', 'openblas', 'OpenBLAS', 'flexiblas', 'blis', 'blas']
blas = dependency(blas_order)
gsl = dependency(
'gsl',
fallback: ['gsl', 'gsl_dep'],
version: '>=2.5',
required: true,
)
Expand Down
4 changes: 2 additions & 2 deletions src/sage/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ conf_data = configuration_data()
conf_data.set('PACKAGE_VERSION', '1.2.3')
conf_data.set('SAGE_ROOT', meson.current_source_dir() / '..' / '..')
# We use Python's prefix here to make it work with conda
prefix = py.get_variable('prefix', '')
prefix = fs.as_posix(py.get_variable('prefix', ''))
conf_data.set('prefix', prefix)
datadir = fs.expanduser(get_option('datadir'))
if not fs.is_absolute(datadir)
Expand Down Expand Up @@ -56,7 +56,7 @@ ecm_bin = find_program(['ecm', 'gmp-ecm'], required: true)
conf_data.set('SAGE_ECMBIN', ecm_bin.full_path())

config_file = configure_file(
input: '../../pkgs/sage-conf_conda/_sage_conf/_conf.py.in',
input: '../../pkgs/sage-conf/_sage_conf/_conf.py.in',
output: 'config.py',
install_dir: py.get_install_dir() / 'sage',
install: true,
Expand Down

0 comments on commit 09d1d69

Please sign in to comment.