mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-16 14:29:05 -07:00
sys-fs/bees: fix systemd unit and prefix
New quotes (that are needed to handle spaces) leak inside the systemd unit preventing it from starting. Also, was missing ETC_PREFIX path. LIBDIR no longer needed in -9999. Fixing on maintainer's behalf given I indirectly caused this issue. Closes: https://github.com/gentoo/gentoo/pull/21570 Thanks-to: Alessandro Barbieri <lssndrbarbieri@gmail.com> Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
@@ -77,6 +77,7 @@ src_prepare() {
|
||||
src_configure() {
|
||||
tc-export CC CXX
|
||||
cat >localconf <<-EOF || die
|
||||
ETC_PREFIX="${EPREFIX}/etc"
|
||||
LIBEXEC_PREFIX="${EPREFIX}/usr/libexec"
|
||||
PREFIX="${EPREFIX}/usr"
|
||||
LIBDIR="${EPREFIX}/$(get_libdir)"
|
||||
@@ -92,3 +93,9 @@ src_configure() {
|
||||
echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
# localconf quotes leak in the systemd unit but are still needed for spaces
|
||||
sed -i 's/"//g' scripts/beesd@.service || die
|
||||
}
|
||||
@@ -74,9 +74,9 @@ src_prepare() {
|
||||
src_configure() {
|
||||
tc-export CC CXX AR
|
||||
cat >localconf <<-EOF || die
|
||||
ETC_PREFIX="${EPREFIX}/etc"
|
||||
LIBEXEC_PREFIX="${EPREFIX}/usr/libexec"
|
||||
PREFIX="${EPREFIX}/usr"
|
||||
LIBDIR="${EPREFIX}/$(get_libdir)"
|
||||
SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)"
|
||||
DEFAULT_MAKE_TARGET=all
|
||||
EOF
|
||||
@@ -87,3 +87,9 @@ src_configure() {
|
||||
echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
# localconf quotes leak in the systemd unit but are still needed for spaces
|
||||
sed -i 's/"//g' scripts/beesd@.service || die
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user