Skip to content

Commit c98744b

Browse files
committed
trying some tweaks
1 parent f6c6700 commit c98744b

File tree

2 files changed

+14
-17
lines changed

2 files changed

+14
-17
lines changed

quaddtype/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ conda_prefix = run_command('bash', '-c', 'echo $CONDA_PREFIX', check: true).stdo
1212
add_project_link_arguments('-L' + conda_prefix + '/lib', language: ['c', 'cpp'])
1313
add_project_arguments('-I' + conda_prefix + '/include', language: ['c', 'cpp'])
1414

15-
# Use pkg-config to find SLEEF
15+
# Try to use pkg-config first
1616
pkgconfig = import('pkgconfig')
1717
sleef_dep = dependency('sleef', required : false)
1818

@@ -34,7 +34,7 @@ incdir_numpy = run_command(py,
3434
).stdout().strip()
3535

3636
includes = include_directories(
37-
[incdir_numpy, 'quaddtype/src']
37+
[incdir_numpy, 'quaddtype/src', conda_prefix + '/include']
3838
)
3939

4040
srcs = [

quaddtype/pyproject.toml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
[build-system]
2-
requires = [
3-
"meson>=1.3.2",
4-
"meson-python",
5-
"wheel",
6-
"numpy"
7-
]
2+
requires = ["meson>=1.3.2", "meson-python", "wheel", "numpy"]
83
build-backend = "mesonpy"
94

105
[project]
@@ -14,14 +9,10 @@ version = "0.0.1"
149
readme = 'README.md'
1510
authors = [{name = "Swayam Singh", email = "[email protected]"}]
1611
requires-python = ">=3.10.0"
17-
dependencies = [
18-
"numpy"
19-
]
12+
dependencies = ["numpy"]
2013

2114
[project.optional-dependencies]
22-
test = [
23-
"pytest",
24-
]
15+
test = ["pytest"]
2516

2617
[tool.cibuildwheel]
2718
archs = ["auto64"]
@@ -48,9 +39,12 @@ source ~/.bashrc
4839
conda config --set always_yes yes --set changeps1 no
4940
conda update -q conda
5041
conda info -a
51-
conda install -y -c conda-forge sleef
42+
conda install -y -c conda-forge sleef pkg-config
43+
pkg-config --version
44+
echo $PKG_CONFIG_PATH
45+
ls -l $HOME/miniconda/lib/pkgconfig
5246
"""
53-
environment = { LD_LIBRARY_PATH = "$HOME/miniconda/lib:$LD_LIBRARY_PATH", LIBRARY_PATH = "$HOME/miniconda/lib:$LIBRARY_PATH", CFLAGS = "-I$HOME/miniconda/include $CFLAGS", CXXFLAGS = "-I$HOME/miniconda/include $CXXFLAGS", LDFLAGS = "-L$HOME/miniconda/lib $LDFLAGS" }
47+
environment = { LD_LIBRARY_PATH = "$HOME/miniconda/lib:$LD_LIBRARY_PATH", LIBRARY_PATH = "$HOME/miniconda/lib:$LIBRARY_PATH", CFLAGS = "-I$HOME/miniconda/include $CFLAGS", CXXFLAGS = "-I$HOME/miniconda/include $CXXFLAGS", LDFLAGS = "-L$HOME/miniconda/lib $LDFLAGS", PKG_CONFIG_PATH = "$HOME/miniconda/lib/pkgconfig:$PKG_CONFIG_PATH", PATH = "$HOME/miniconda/bin:$PATH" }
5448
repair-wheel-command = "auditwheel repair -w {dest_dir} --plat manylinux_2_28_x86_64 {wheel}"
5549

5650
[tool.cibuildwheel.macos]
@@ -65,6 +59,9 @@ conda config --set always_yes yes --set changeps1 no
6559
conda update -q conda
6660
conda info -a
6761
conda install -y -c conda-forge sleef pkg-config
62+
pkg-config --version
63+
echo $PKG_CONFIG_PATH
64+
ls -l $HOME/miniconda/lib/pkgconfig
6865
"""
69-
environment = {DYLD_LIBRARY_PATH = "$HOME/miniconda/lib:$DYLD_LIBRARY_PATH", LIBRARY_PATH = "$HOME/miniconda/lib:$LIBRARY_PATH", CFLAGS = "-I$HOME/miniconda/include $CFLAGS", CXXFLAGS = "-I$HOME/miniconda/include $CXXFLAGS", LDFLAGS = "-L$HOME/miniconda/lib $LDFLAGS", PKG_CONFIG_PATH = "$HOME/miniconda/lib/pkgconfig:$PKG_CONFIG_PATH"}
66+
environment = { DYLD_LIBRARY_PATH = "$HOME/miniconda/lib:$DYLD_LIBRARY_PATH", LIBRARY_PATH = "$HOME/miniconda/lib:$LIBRARY_PATH", CFLAGS = "-I$HOME/miniconda/include $CFLAGS", CXXFLAGS = "-I$HOME/miniconda/include $CXXFLAGS", LDFLAGS = "-L$HOME/miniconda/lib $LDFLAGS", PKG_CONFIG_PATH = "$HOME/miniconda/lib/pkgconfig:$PKG_CONFIG_PATH", PATH = "$HOME/miniconda/bin:$PATH" }
7067
repair-wheel-command = "delocate-wheel -w {dest_dir} -v {wheel}"

0 commit comments

Comments
 (0)