commit: 86e02411b44c6add8ed40c90994e6b72474dce06
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 26 18:16:20 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Oct 26 18:17:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86e02411
sys-apps/systemd: always pass -Drootlibdir=/usr/...
This ensures the pkgconfig file points to the correct directory for
static linking.
Package-Manager: Portage-2.3.78_p4, Repoman-2.3.17_p100
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../{systemd-243-r1.ebuild => systemd-243-r2.ebuild} | 14 +++-----------
sys-apps/systemd/systemd-9999.ebuild | 14 +++-----------
2 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/sys-apps/systemd/systemd-243-r1.ebuild
b/sys-apps/systemd/systemd-243-r2.ebuild
similarity index 97%
rename from sys-apps/systemd/systemd-243-r1.ebuild
rename to sys-apps/systemd/systemd-243-r2.ebuild
index 261851cf5bb..0bb00e81ae5 100644
--- a/sys-apps/systemd/systemd-243-r1.ebuild
+++ b/sys-apps/systemd/systemd-243-r2.ebuild
@@ -237,6 +237,7 @@ multilib_src_configure() {
# make sure we get /bin:/sbin in PATH
-Dsplit-usr=$(usex split-usr true false)
-Drootprefix="$(usex split-usr "${EPREFIX:-/}"
"${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-Dsysvinit-path=
-Dsysvrcnd-path=
# Avoid infinite exec recursion, bug 642724
@@ -305,12 +306,6 @@ multilib_src_configure() {
-Dstatic-libudev=$(usex static-libs true false)
)
- if multilib_is_native_abi; then
- myconf+=( -Drootlibdir="${EPREFIX}$(usex split-usr ''
/usr)/$(get_libdir)" )
- else
- myconf+=( -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" )
- fi
-
meson_src_configure "${myconf[@]}"
}
@@ -370,12 +365,9 @@ multilib_src_install_all() {
# Avoid breaking boot/reboot
dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
dosym ../../../lib/systemd/systemd-shutdown
/usr/lib/systemd/systemd-shutdown
-
- if use static-libs; then
- mv "${ED}/$(get_libdir)"/lib{systemd,udev}.a
"${ED}/usr/$(get_libdir)/" || die
- gen_usr_ldscript lib{systemd,udev}.so
- fi
fi
+
+ gen_usr_ldscript -a systemd udev
}
migrate_locale() {
diff --git a/sys-apps/systemd/systemd-9999.ebuild
b/sys-apps/systemd/systemd-9999.ebuild
index 261851cf5bb..0bb00e81ae5 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -237,6 +237,7 @@ multilib_src_configure() {
# make sure we get /bin:/sbin in PATH
-Dsplit-usr=$(usex split-usr true false)
-Drootprefix="$(usex split-usr "${EPREFIX:-/}"
"${EPREFIX}/usr")"
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-Dsysvinit-path=
-Dsysvrcnd-path=
# Avoid infinite exec recursion, bug 642724
@@ -305,12 +306,6 @@ multilib_src_configure() {
-Dstatic-libudev=$(usex static-libs true false)
)
- if multilib_is_native_abi; then
- myconf+=( -Drootlibdir="${EPREFIX}$(usex split-usr ''
/usr)/$(get_libdir)" )
- else
- myconf+=( -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" )
- fi
-
meson_src_configure "${myconf[@]}"
}
@@ -370,12 +365,9 @@ multilib_src_install_all() {
# Avoid breaking boot/reboot
dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
dosym ../../../lib/systemd/systemd-shutdown
/usr/lib/systemd/systemd-shutdown
-
- if use static-libs; then
- mv "${ED}/$(get_libdir)"/lib{systemd,udev}.a
"${ED}/usr/$(get_libdir)/" || die
- gen_usr_ldscript lib{systemd,udev}.so
- fi
fi
+
+ gen_usr_ldscript -a systemd udev
}
migrate_locale() {
