Skip to content

Commit 9771f44

Browse files
committed
Pass the boost path from configure --with-boost down to meson
1 parent 08aed60 commit 9771f44

File tree

4 files changed

+12
-1
lines changed

4 files changed

+12
-1
lines changed

build/pkgs/sagelib/spkg-install.in

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ SITEPACKAGESDIR=$(python3 -c 'import sysconfig; print(sysconfig.get_paths()["pur
4444
# does not shadow the namespace package sage during the build.
4545
(cd "$SITEPACKAGESDIR" && rm -f sage/__init__.py)
4646
if [ "$SAGE_EDITABLE" = yes ]; then
47-
sdh_pip_editable_install . --config-settings=build-dir="build/sage-distro" --config-settings=setup-args="-DSAGE_LOCAL=$SAGE_LOCAL"
47+
sdh_pip_editable_install . \
48+
--config-settings=build-dir="build/sage-distro" \
49+
--config-settings=setup-args="--native-file=$SAGE_PKGS/../platform/meson/sage-configure-native-file.ini" \
50+
--config-settings=setup-args="-DSAGE_LOCAL=$SAGE_LOCAL"
4851

4952
if [ "$SAGE_WHEELS" = yes ]; then
5053
# Additionally build a wheel (for use in other venvs)

build/platform/meson/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
sage-configure-native-file.ini
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# These meson settings are from Sage ./configure
2+
3+
[properties]
4+
5+
# Forwarded path from ./configure --with-boost=/path/to/boost
6+
boost_root = '@SAGE_BOOST_PREFIX@'

configure.ac

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,7 @@ AC_SUBST(SAGE_PKG_CONFIG_PATH, [$SAGE_DARWIN_PKG_CONFIG_PATH'$SAGE_LOCAL/lib/pkg
580580

581581
AC_CONFIG_FILES([build/make/Makefile-auto build/make/Makefile])
582582
AC_CONFIG_FILES([src/bin/sage-env-config src/bin/sage-src-env-config build/bin/sage-build-env-config])
583+
AC_CONFIG_FILES([build/platform/meson/sage-configure-native-file.ini])
583584

584585
AC_CONFIG_FILES([pkgs/sage-conf/_sage_conf/_conf.py])
585586

0 commit comments

Comments
 (0)