Skip to content

Commit 08aed60

Browse files
committed
Define a SAGE_CONFIGURE_BOOST environment variable in the build shell
This makes the top-level configure --with-boost=... available for package configurations. It is then passed down into brial's configure.
1 parent 4e2319b commit 08aed60

File tree

4 files changed

+11
-0
lines changed

4 files changed

+11
-0
lines changed

build/bin/sage-build-env

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,13 @@ if [ "x$SAGE_BUILD_ENV_SOURCED" = "x" ]; then
8888
export SAGE_CONFIGURE_PARI="--with-pari=$SAGE_PARI_PREFIX"
8989
fi
9090

91+
# This is usually blank if the system boost is used
92+
if [ -n "$SAGE_BOOST_PREFIX" ]; then
93+
# Some packages that depend on boost accept a --with-boost=<prefix> flag to
94+
# their ./configure scripts. Thus we deal with this just as with GMP above.
95+
export SAGE_CONFIGURE_BOOST="--with-boost=$SAGE_BOOST_PREFIX"
96+
fi
97+
9198
# Optimization flags.
9299
#
93100
# The compiler flags are set in order of priority by

build/bin/sage-build-env-config.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ export SAGE_SUITESPARSE_PREFIX="@SAGE_SUITESPARSE_PREFIX@"
5858

5959
export SAGE_CONFIGURE_FFLAS_FFPACK="@SAGE_CONFIGURE_FFLAS_FFPACK@"
6060

61+
export SAGE_BOOST_PREFIX="@SAGE_BOOST_PREFIX@"
62+
6163
export SAGE_HAVE_LIBJPEG="@SAGE_HAVE_LIBJPEG@"
6264

6365
export SAGE_FRICAS_LISP="@SAGE_FRICAS_LISP@"

build/pkgs/brial/spkg-install.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ cd src
77
cp "$SAGE_ROOT"/config/config.* .
88
sdh_configure \
99
--enable-shared --disable-static \
10+
$SAGE_CONFIGURE_BOOST \
1011
--with-boost-unit-test-framework=no
1112
sdh_make
1213
sdh_make_install

m4/ax_boost_base.m4

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ AS_IF([test "x$want_boost" = "xyes"],
7979
[_AX_BOOST_BASE_RUNDETECT([$1],[$2],[$3])])
8080
AC_SUBST(BOOST_CPPFLAGS)
8181
AC_SUBST(BOOST_LDFLAGS)
82+
AC_SUBST(SAGE_BOOST_PREFIX,[$_AX_BOOST_BASE_boost_path])
8283
])
8384

8485

0 commit comments

Comments
 (0)