Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Meson: minor revision #38910

Merged
merged 1 commit into from
Nov 16, 2024
Merged

Meson: minor revision #38910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading