Skip to content

Commit 3942e22

Browse files
authored
Update boost repository location and bump default version (#505)
1 parent 32427e5 commit 3942e22

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

docs/building_blocks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ repository. For versions of Boost older than 1.63.0, the
246246
SourceForge repository should be used. The default is False.
247247

248248
- __version__: The version of Boost source to download. The default
249-
value is `1.76.0`.
249+
value is `1.87.0`.
250250

251251
__Examples__
252252

hpccm/building_blocks/boost.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class boost(bb_base, hpccm.templates.envvars, hpccm.templates.ldconfig,
8282
SourceForge repository should be used. The default is False.
8383
8484
version: The version of Boost source to download. The default
85-
value is `1.76.0`.
85+
value is `1.87.0`.
8686
8787
# Examples
8888
@@ -103,14 +103,14 @@ def __init__(self, **kwargs):
103103

104104
self.__b2_opts = kwargs.get('b2_opts', [])
105105
self.__baseurl = kwargs.get('baseurl',
106-
'https://boostorg.jfrog.io/artifactory/main/release/__version__/source')
106+
'https://archives.boost.io/release/__version__/source')
107107
self.__bootstrap_opts = kwargs.get('bootstrap_opts', [])
108108
self.__ospackages = kwargs.get('ospackages', [])
109109
self.__parallel = kwargs.get('parallel', '$(nproc)')
110110
self.__prefix = kwargs.get('prefix', '/usr/local/boost')
111111
self.__python = kwargs.get('python', False)
112112
self.__sourceforge = kwargs.get('sourceforge', False)
113-
self.__version = kwargs.get('version', '1.76.0')
113+
self.__version = kwargs.get('version', '1.87.0')
114114

115115
self.__commands = [] # Filled in by __setup()
116116
self.__wd = kwargs.get('wd', hpccm.config.g_wd) # working directory

test/test_boost.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def test_defaults_ubuntu(self):
3737
"""Default boost building block"""
3838
b = boost()
3939
self.assertEqual(str(b),
40-
r'''# Boost version 1.76.0
40+
r'''# Boost version 1.87.0
4141
RUN apt-get update -y && \
4242
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
4343
bzip2 \
@@ -46,11 +46,11 @@ def test_defaults_ubuntu(self):
4646
wget \
4747
zlib1g-dev && \
4848
rm -rf /var/lib/apt/lists/*
49-
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2 && \
50-
mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_76_0.tar.bz2 -C /var/tmp -j && \
51-
cd /var/tmp/boost_1_76_0 && ./bootstrap.sh --prefix=/usr/local/boost --without-libraries=python && \
49+
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.bz2 && \
50+
mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_87_0.tar.bz2 -C /var/tmp -j && \
51+
cd /var/tmp/boost_1_87_0 && ./bootstrap.sh --prefix=/usr/local/boost --without-libraries=python && \
5252
./b2 -j$(nproc) -q install && \
53-
rm -rf /var/tmp/boost_1_76_0.tar.bz2 /var/tmp/boost_1_76_0
53+
rm -rf /var/tmp/boost_1_87_0.tar.bz2 /var/tmp/boost_1_87_0
5454
ENV LD_LIBRARY_PATH=/usr/local/boost/lib:$LD_LIBRARY_PATH''')
5555

5656
@centos
@@ -59,7 +59,7 @@ def test_defaults_centos(self):
5959
"""Default boost building block"""
6060
b = boost()
6161
self.assertEqual(str(b),
62-
r'''# Boost version 1.76.0
62+
r'''# Boost version 1.87.0
6363
RUN yum install -y \
6464
bzip2 \
6565
bzip2-devel \
@@ -68,11 +68,11 @@ def test_defaults_centos(self):
6868
which \
6969
zlib-devel && \
7070
rm -rf /var/cache/yum/*
71-
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2 && \
72-
mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_76_0.tar.bz2 -C /var/tmp -j && \
73-
cd /var/tmp/boost_1_76_0 && ./bootstrap.sh --prefix=/usr/local/boost --without-libraries=python && \
71+
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.bz2 && \
72+
mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_87_0.tar.bz2 -C /var/tmp -j && \
73+
cd /var/tmp/boost_1_87_0 && ./bootstrap.sh --prefix=/usr/local/boost --without-libraries=python && \
7474
./b2 -j$(nproc) -q install && \
75-
rm -rf /var/tmp/boost_1_76_0.tar.bz2 /var/tmp/boost_1_76_0
75+
rm -rf /var/tmp/boost_1_87_0.tar.bz2 /var/tmp/boost_1_87_0
7676
ENV LD_LIBRARY_PATH=/usr/local/boost/lib:$LD_LIBRARY_PATH''')
7777

7878
@ubuntu
@@ -90,7 +90,7 @@ def test_python(self):
9090
wget \
9191
zlib1g-dev && \
9292
rm -rf /var/lib/apt/lists/*
93-
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
93+
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://archives.boost.io/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
9494
mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_72_0.tar.bz2 -C /var/tmp -j && \
9595
cd /var/tmp/boost_1_72_0 && ./bootstrap.sh --prefix=/usr/local/boost && \
9696
./b2 -j$(nproc) -q install && \
@@ -134,7 +134,7 @@ def test_ldconfig(self):
134134
wget \
135135
zlib1g-dev && \
136136
rm -rf /var/lib/apt/lists/*
137-
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://boostorg.jfrog.io/artifactory/main/release/1.68.0/source/boost_1_68_0.tar.bz2 && \
137+
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://archives.boost.io/release/1.68.0/source/boost_1_68_0.tar.bz2 && \
138138
mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_68_0.tar.bz2 -C /var/tmp -j && \
139139
cd /var/tmp/boost_1_68_0 && ./bootstrap.sh --prefix=/usr/local/boost --without-libraries=python && \
140140
./b2 -j$(nproc) -q install && \
@@ -156,7 +156,7 @@ def test_bootstrap_opts(self):
156156
wget \
157157
zlib1g-dev && \
158158
rm -rf /var/lib/apt/lists/*
159-
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
159+
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://archives.boost.io/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
160160
mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_72_0.tar.bz2 -C /var/tmp -j && \
161161
cd /var/tmp/boost_1_72_0 && ./bootstrap.sh --prefix=/usr/local/boost --with-libraries=atomic,chrono && \
162162
./b2 -j$(nproc) -q install && \
@@ -177,7 +177,7 @@ def test_b2_opts(self):
177177
wget \
178178
zlib1g-dev && \
179179
rm -rf /var/lib/apt/lists/*
180-
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
180+
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://archives.boost.io/release/1.72.0/source/boost_1_72_0.tar.bz2 && \
181181
mkdir -p /var/tmp && tar -x -f /var/tmp/boost_1_72_0.tar.bz2 -C /var/tmp -j && \
182182
cd /var/tmp/boost_1_72_0 && ./bootstrap.sh --prefix=/usr/local/boost --without-libraries=python && \
183183
./b2 cxxflags="-std=c++14" -j$(nproc) -q install && \

0 commit comments

Comments
 (0)