Skip to content

Commit 4675bc1

Browse files
committed
Switch boost to cmake build
This gets rid of our previous hackish-way of installing it and finally integrates it nicely with out JHBuild setup.
1 parent da60e8d commit 4675bc1

2 files changed

Lines changed: 10 additions & 14 deletions

File tree

modulesets/inkscape.modules

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
88
tidy -config tidy.conf -m inkscape.modules
99
-->
10-
<repository name="boost"
11-
href="https://archives.boost.io/release/"
12-
type="tarball" />
1310
<repository name="freedesktop"
1411
href="https://gitlab.freedesktop.org/"
1512
type="tarball" />
@@ -59,18 +56,14 @@
5956
installation means that JHBuild will (re-)install this everytime
6057
it gets pulled in.
6158
-->
62-
<autotools id="boost"
63-
autogen-sh="bootstrap.sh"
64-
autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s %(autogenargs)s"
65-
autogenargs="--without-libraries=python"
66-
makeargs="|| ./b2 -d0 install"
67-
skip-install="yes"
68-
supports-non-srcdir-builds="no">
69-
<branch module="1.85.0/source/boost_1_85_0.tar.bz2"
59+
<cmake id="boost"
60+
cmakeargs="-DCMAKE_BUILD_TYPE=Release">
61+
<branch module="boostorg/boost/releases/download/boost-1.85.0/boost-1.85.0-cmake.tar.xz"
7062
version="1.85.0"
71-
hash="sha256:7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617"
72-
repo="boost" />
73-
</autotools>
63+
hash="sha256:0a9cc56ceae46986f5f4d43fe0311d90cf6d2fa9028258a95cab49ffdacf92ad"
64+
checkoutdir="boost-1.85.0"
65+
repo="github" />
66+
</cmake>
7467
<!--
7568
CapyPDF https://github.com/jpakkane/capypdf
7669
-->

modulesets/jhbuildrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ module_extra_env["libvisio"] = { "CXXFLAGS": "-std=c++17 -D_LIBCPP_ENABLE_CXX17_
1111
#
1212
module_extra_env["librevenge"] = { "CXXFLAGS": "-std=c++17 -D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION" }
1313

14+
#
15+
module_extra_env["boost"] = { "CXXFLAGS": "-std=c++17" }
16+
1417
# Cannot disable autoconf's call to gtkdocize by other means, so we're turning
1518
# it into a dummy call. This workaround has been taken from
1619
# https://github.com/spack/spack/issues/23964

0 commit comments

Comments
 (0)