commit: ccc0f339e6397fdccb6b19c3f84948cea4085965
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 16 18:35:09 2026 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Feb 16 18:38:39 2026 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ccc0f339
gkbuilds: add b2 (for newer boost), remove boost-build
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
defaults/software.sh | 16 ++++++++--------
gkbuilds/{boost-build.gkbuild => b2.gkbuild} | 28 ++++++++++++++--------------
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/defaults/software.sh b/defaults/software.sh
index 42004f39..52f7b649 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -9,6 +9,13 @@
# - This file should not override previously defined variables, as their
values may
# originate from user changes to /etc/genkernel.conf .
+GKPKG_B2_PN="b2"
+GKPKG_B2_PV="${GKPKG_B2_PV:-${VERSION_B2}}"
+GKPKG_B2_DEPS=""
+GKPKG_B2_SRCTAR="${GKPKG_B2_SRCTAR:-${DISTDIR}/b2-${GKPKG_B2_PV}.tar.gz}"
+GKPKG_B2_SRCDIR="${GKPKG_3_SRCDIR:-b2-${GKPKG_B2_PV}}"
+GKPKG_B2_BINPKG="${GKPKG_B2_BINPKG:-%%CACHE%%/b2-${GKPKG_B2_PV}.tar.xz}"
+
GKPKG_BCACHE_TOOLS_PN="bcache-tools"
GKPKG_BCACHE_TOOLS_PV="${GKPKG_BCACHE_TOOLS_PV:-${VERSION_BCACHE_TOOLS}}"
GKPKG_BCACHE_TOOLS_DEPS="util-linux eudev"
@@ -18,18 +25,11 @@
GKPKG_BCACHE_TOOLS_BINPKG="${GKPKG_BCACHE_TOOLS_BINPKG:-%%CACHE%%/bcache-tools-$
GKPKG_BOOST_PN="boost"
GKPKG_BOOST_PV="${GKPKG_BOOST_PV:-${VERSION_BOOST}}"
-GKPKG_BOOST_DEPS="boost-build"
+GKPKG_BOOST_DEPS="b2"
GKPKG_BOOST_SRCTAR="${GKPKG_BOOST_SRCTAR:-${DISTDIR}/boost_${GKPKG_BOOST_PV//./_}.tar.bz2}"
GKPKG_BOOST_SRCDIR="${GKPKG_BOOST_SRCDIR:-boost_${GKPKG_BOOST_PV//./_}}"
GKPKG_BOOST_BINPKG="${GKPKG_BOOST_BINPKG:-%%CACHE%%/boost-${GKPKG_BOOST_PV}-%%ARCH%%.tar.xz}"
-GKPKG_BOOST_BUILD_PN="boost-build"
-GKPKG_BOOST_BUILD_PV="${GKPKG_BOOST_PV}"
-GKPKG_BOOST_BUILD_DEPS=""
-GKPKG_BOOST_BUILD_SRCTAR="${GKPKG_BOOST_SRCTAR}"
-GKPKG_BOOST_BUILD_SRCDIR="${GKPKG_BOOST_SRCDIR}"
-GKPKG_BOOST_BUILD_BINPKG="${GKPKG_BOOST_BUILD_BINPKG:-%%CACHE%%/boost-build-${GKPKG_BOOST_BUILD_PV}.tar.xz}"
-
GKPKG_BTRFS_PROGS_PN="btrfs-progs"
GKPKG_BTRFS_PROGS_PV="${GKPKG_BTRFS_PROGS_PV:-${VERSION_BTRFS_PROGS}}"
GKPKG_BTRFS_PROGS_DEPS="util-linux zlib zstd lzo eudev"
diff --git a/gkbuilds/boost-build.gkbuild b/gkbuilds/b2.gkbuild
similarity index 59%
rename from gkbuilds/boost-build.gkbuild
rename to gkbuilds/b2.gkbuild
index 0e06ba7d..d26bbcf9 100644
--- a/gkbuilds/boost-build.gkbuild
+++ b/gkbuilds/b2.gkbuild
@@ -5,20 +5,22 @@
# to local processing; Even when using distcc pump mode.
DISABLE_DISTCC=yes
-MY_PV="${PV//./_}"
-S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
+S="${WORKDIR}/${P}/src"
QA_IGNORE_DYNAMICALLY_LINKED_PROGRAM='(bjam|b2)$'
src_compile() {
cd engine || die "Failed to chdir to '${S}/engine'!"
+ # don't call windres since it leads to broken relocations
+ export B2_DONT_EMBED_MANIFEST=1
+
# Using BUILD CXX here because the host system
# building the initramfs must be able to execute created b2 program
local myargs=(
./build.sh
cxx
--cxx="$(tc-getBUILD_CXX)"
- --cxxflags="${CXXFLAGS}"
+ --cxxflags="-pthread ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}"
-d+2
--without-python
)
@@ -30,29 +32,27 @@ src_install() {
mkdir -p "${D}"/usr/bin \
|| die "Failed to create '${D}/usr/bin'!"
- cp --target-directory="${D}/usr/bin" engine/{bjam,b2} \
- || die "Failed to install 'engine/{bjam,b2}' to '${D}/usr/bin'!"
+ cp --target-directory="${D}/usr/bin" engine/b2 \
+ || die "Failed to install 'engine/b2' to '${D}/usr/bin'!"
- mkdir -p "${D}"/usr/share/boost-build \
+ mkdir -p "${D}"/usr/share/b2/src \
|| die "Failed to create '${D}/usr/share/boost-build'!"
cp \
--recursive \
- --target-directory="${D}/usr/share/boost-build" \
- ../boost-build.jam \
- bootstrap.jam \
+ --target-directory="${D}/usr/share/b2/src" \
build-system.jam \
../example/user-config.jam \
build \
- kernel \
+ contrib \
options \
tools \
util \
- || die "Failed to copy *.jam files to
'${D}/usr/share/boost-build'!"
+ || die "Failed to copy *.jam files to '${D}/usr/share/b2/src'!"
- find "${D}/usr/share/boost-build" -iname "*.py" -delete \
+ find "${D}/usr/share/b2/src" -iname "*.py" -delete \
|| die "Failed to remove python files"
- echo 'variant gentoorelease : release : <optimization>off
<debug-symbols>off <runtime-link>shared ;' >
"${D}/usr/share/boost-build/site-config.jam" \
- || die "Failed to create
'${D}/usr/share/boost-build/site-config.jam'!"
+ echo 'variant gentoorelease : release : <optimization>off
<debug-symbols>off <runtime-link>shared ;' >
"${D}/usr/share/b2/src/site-config.jam" \
+ || die "Failed to create
'${D}/usr/share/b2/src/site-config.jam'!"
}
