Skip to content

Commit 9d039fe

Browse files
author
Release Manager
committed
sagemathgh-40689: remove boost_cropped spkg, add boost to prereqs boost is available on all the supported platforms, and maintaining the spkg thus makes no sense any more. So e.g sagemath#34748 can be closed ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [x] The title is concise and informative. - [x] The description explains in detail what this PR is about. - [x] 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#40689 Reported by: Dima Pasechnik Reviewer(s): Antonio Rojas, Dima Pasechnik
2 parents e54b827 + 5373b22 commit 9d039fe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+85
-162
lines changed

.github/workflows/dist.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ jobs:
185185
# SPKGs to install as system packages
186186
SPKGS: _bootstrap _prereq
187187
# Non-Python packages to install as spkgs
188-
TARGETS_PRE: gmp mpfr mpc bliss coxeter3 mcqd meataxe sirocco boost_cropped tdlib
188+
TARGETS_PRE: gmp mpfr mpc bliss coxeter3 mcqd meataxe sirocco tdlib
189189
CIBW_BUILD: "*${{ matrix.build }}*"
190190
# Disable building PyPy wheels on all platforms
191191
CIBW_SKIP: "pp*"

COPYING.txt

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ SOFTWARE LICENSE
3333
-----------------------------------------------------------------------
3434
boehm_gc MIT-like license (see below)
3535
backports_ssl_match_hostname Python License
36-
boost_cropped Boost Software License (see below)
3736
cddlib GPLv2+
3837
certifi ISC
3938
cliquer GPLv2+
@@ -795,35 +794,6 @@ simplicity, included in its entirety.
795794

796795
================================================================================
797796

798-
boost_cropped:
799-
(http://www.boost.org/LICENSE_1_0.txt)
800-
801-
Boost Software License - Version 1.0 - August 17th, 2003
802-
803-
Permission is hereby granted, free of charge, to any person or organization
804-
obtaining a copy of the software and accompanying documentation covered by
805-
this license (the "Software") to use, reproduce, display, distribute,
806-
execute, and transmit the Software, and to prepare derivative works of the
807-
Software, and to permit third-parties to whom the Software is furnished to
808-
do so, all subject to the following:
809-
810-
The copyright notices in the Software and this entire statement, including
811-
the above license grant, this restriction and the following disclaimer,
812-
must be included in all copies of the Software, in whole or in part, and
813-
all derivative works of the Software, unless such copies or derivative
814-
works are solely in the form of machine-executable object code generated by
815-
a source language processor.
816-
817-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
818-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
819-
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
820-
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
821-
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
822-
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
823-
DEALINGS IN THE SOFTWARE.
824-
825-
================================================================================
826-
827797
bzip2:
828798
(http://www.bzip.org/)
829799
This program, "bzip2", the associated library "libbzip2", and all

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ misc-clean:
156156
rm -f aclocal.m4 config.log confcache
157157
rm -rf autom4te.cache
158158
rm -f build/make/Makefile build/make/Makefile-auto
159+
rm -f build/platform/meson/sage-configure-native-file.ini
159160
rm -rf src/lib
160161

161162
bdist-clean: clean

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/_prereq/SPKG.rst

Lines changed: 17 additions & 2 deletions

build/pkgs/_prereq/distros/alpine.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ ca-certificates
2020
coreutils
2121
patch
2222
bzip2
23-
patch
2423
pkgconf
2524
zlib-dev
25+
boost

build/pkgs/_prereq/distros/arch.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,5 @@ which
2121
patch
2222
pkgconf
2323
zlib
24+
boost
25+
libboost-devel

build/pkgs/_prereq/distros/conda.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ bzip2
1919
pkg-config
2020
zlib
2121
zlib-devel
22+
libboost-devel

build/pkgs/_prereq/distros/debian.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@ ca-certificates
3232
patch
3333
pkg-config
3434
libz-dev
35+
libboost-dev

0 commit comments

Comments
 (0)