mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-04 13:47:35 -08:00
dev-util/schroot: fix build with boost-1.89.0
Closes: https://bugs.gentoo.org/962945 Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com> Part-of: https://github.com/gentoo/gentoo/pull/43810 Closes: https://github.com/gentoo/gentoo/pull/43810 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Holger Hoffstätte
Sam James
parent
4479114d90
commit
3bf0b1bad9
20
dev-util/schroot/files/schroot-1.6.13_p7-boost-1.89.0.patch
Normal file
20
dev-util/schroot/files/schroot-1.6.13_p7-boost-1.89.0.patch
Normal file
@ -0,0 +1,20 @@
|
||||
Fix build with boost-1.89.0
|
||||
From: https://codeberg.org/shelter/reschroot/issues/33
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 35da3380..fa4b55db 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -59,7 +59,11 @@ find_package(Threads REQUIRED)
|
||||
|
||||
include(FindBoost)
|
||||
find_package(Boost REQUIRED
|
||||
- COMPONENTS filesystem system iostreams program_options regex)
|
||||
+ COMPONENTS filesystem iostreams program_options regex)
|
||||
+if(Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION LESS 69)
|
||||
+ list(APPEND BOOST_REQUIRED_COMPONENTS system)
|
||||
+ find_package(Boost REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
|
||||
+endif()
|
||||
|
||||
# HEADER CHECKS
|
||||
include(CheckIncludeFileCXX)
|
||||
168
dev-util/schroot/schroot-1.6.13_p7-r2.ebuild
Normal file
168
dev-util/schroot/schroot-1.6.13_p7-r2.ebuild
Normal file
@ -0,0 +1,168 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit bash-completion-r1 cmake dot-a pam tmpfiles
|
||||
|
||||
MY_P=${PN}_${PV/_p/-}
|
||||
|
||||
DESCRIPTION="Utility to execute commands in a chroot environment"
|
||||
HOMEPAGE="https://codeberg.org/shelter/reschroot"
|
||||
SRC_URI="https://codeberg.org/shelter/reschroot/archive/release/re${P/%_p*}.tar.gz -> ${P/%_p*}.tar.gz
|
||||
mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.debian.tar.xz"
|
||||
S="${WORKDIR}/re${PN}"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
|
||||
IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
COMMON_DEPEND="
|
||||
dev-libs/boost:=
|
||||
>=sys-apps/util-linux-2.16
|
||||
btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
|
||||
lvm? ( sys-fs/lvm2 )
|
||||
pam? ( sys-libs/pam )
|
||||
zfs? ( sys-fs/zfs )
|
||||
"
|
||||
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
app-arch/xz-utils
|
||||
sys-apps/groff
|
||||
doc? (
|
||||
app-text/doxygen
|
||||
media-gfx/graphviz
|
||||
)
|
||||
nls? (
|
||||
>=app-text/po4a-0.40
|
||||
sys-devel/gettext
|
||||
)
|
||||
test? ( >=dev-util/cppunit-1.10.0 )
|
||||
"
|
||||
#sys-apps/debianutils
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
dchroot? ( !sys-apps/dchroot )
|
||||
nls? ( virtual/libintl )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.6.13_p7-build-fixes.patch
|
||||
|
||||
# https://codeberg.org/shelter/reschroot/pulls/6
|
||||
"${FILESDIR}"/${PN}-1.6.13-resize-reserve.patch
|
||||
|
||||
"${FILESDIR}"/${PN}-1.6.13_p2-boost-1.85.0.patch
|
||||
|
||||
"${FILESDIR}"/${PN}-1.6.13_p7-cmake4.patch # bug #953913
|
||||
|
||||
# https://codeberg.org/shelter/reschroot/issues/33
|
||||
"${FILESDIR}"/${PN}-1.6.13_p7-boost-1.89.0.patch
|
||||
)
|
||||
|
||||
src_unpack() {
|
||||
unpack "${P/%_p*}".tar.gz
|
||||
cd "${S}"
|
||||
unpack ${MY_P}.debian.tar.xz
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt || die
|
||||
eapply "${S}"/debian/patches/*.patch
|
||||
cmake_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
lto-guarantee-fat
|
||||
|
||||
local mycmakeargs=(
|
||||
-Dbtrfs-snapshot=$(usex btrfs)
|
||||
-Ddchroot=$(usex dchroot)
|
||||
-Ddchroot-dsa=$(usex dchroot)
|
||||
-Ddebug=$(usex debug)
|
||||
-Ddoxygen=$(usex doc)
|
||||
-Dlvm-snapshot=$(usex lvm)
|
||||
-Dnls=$(usex nls)
|
||||
-Dpam=$(usex pam)
|
||||
-Dtest=$(usex test)
|
||||
-Dzfs-snapshot=$(usex zfs)
|
||||
-Dbash_completion_dir="$(get_bashcompdir)"
|
||||
-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
|
||||
-DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
|
||||
-DSCHROOT_MOUNT_DIR="${EPREFIX}/run/${PN}/mount"
|
||||
|
||||
-DCMAKE_POLICY_DEFAULT_CMP0167="OLD" # FindBoost
|
||||
-DBoost_NO_BOOST_CMAKE=ON # https://bugs.gentoo.org/791712 and https://bugs.gentoo.org/752120
|
||||
)
|
||||
if ! use nls; then
|
||||
mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND)
|
||||
fi
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake_src_compile all $(usev doc)
|
||||
}
|
||||
|
||||
src_test() {
|
||||
if [[ ${EUID} -ne 0 ]]; then
|
||||
ewarn "Disabling tests because you are not root"
|
||||
return 0
|
||||
fi
|
||||
# -j1 to prevent race between test/setup-test-data and test/cleanup-test-data
|
||||
cmake_src_test -j1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
|
||||
strip-lto-bytecode
|
||||
|
||||
# debian-stype PS1 for chroot
|
||||
# checks for /etc/debian_chroot file, which is created by schroot
|
||||
insinto /etc/bash/bashrc.d
|
||||
doins "${FILESDIR}/schroot_prompt.sh"
|
||||
|
||||
# gentoo /var/tmp/portage handler
|
||||
# e.g. portage.base.tmpdir=/var/tmp/portage in config file
|
||||
# will use a subdirectory of hosts $PORTAGE_TMPDIR
|
||||
exeinto /etc/schroot/setup.d
|
||||
doexe "${FILESDIR}/11gentoo"
|
||||
|
||||
# support for zfs clone options.
|
||||
# zfs.clone.options=com.sun:auto-snapshot=false
|
||||
if use zfs; then
|
||||
exeinto /etc/schroot/setup.d
|
||||
doexe "${FILESDIR}/06zfscloneopts"
|
||||
fi
|
||||
|
||||
keepdir /etc/schroot/chroot.d # bug 961345
|
||||
keepdir /var/lib/schroot/{session,unpack,union/{overlay,underlay}}
|
||||
|
||||
docinto contrib/setup.d
|
||||
dodoc contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
|
||||
|
||||
newdoc debian/schroot.NEWS NEWS.debian
|
||||
|
||||
newinitd "${FILESDIR}"/schroot.initd schroot
|
||||
newconfd "${FILESDIR}"/schroot.confd schroot
|
||||
newtmpfiles "${FILESDIR}"/schroot.tmpfilesd schroot.conf
|
||||
|
||||
if use doc; then
|
||||
docinto html/sbuild
|
||||
dodoc "${BUILD_DIR}"/doc/sbuild/html/*
|
||||
docinto html/schroot
|
||||
dodoc "${BUILD_DIR}"/doc/schroot/html/*
|
||||
fi
|
||||
|
||||
if use pam; then
|
||||
rm -f "${ED}"/etc/pam.d/schroot
|
||||
pamd_mimic_system schroot auth account session
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
tmpfiles_process ${PN}.conf
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user