| 1 |
commit: 86e02411b44c6add8ed40c90994e6b72474dce06 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 26 18:16:20 2019 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 26 18:17:02 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86e02411 |
| 7 |
|
| 8 |
sys-apps/systemd: always pass -Drootlibdir=/usr/... |
| 9 |
|
| 10 |
This ensures the pkgconfig file points to the correct directory for |
| 11 |
static linking. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.78_p4, Repoman-2.3.17_p100 |
| 14 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 15 |
|
| 16 |
.../{systemd-243-r1.ebuild => systemd-243-r2.ebuild} | 14 +++----------- |
| 17 |
sys-apps/systemd/systemd-9999.ebuild | 14 +++----------- |
| 18 |
2 files changed, 6 insertions(+), 22 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-apps/systemd/systemd-243-r1.ebuild b/sys-apps/systemd/systemd-243-r2.ebuild |
| 21 |
similarity index 97% |
| 22 |
rename from sys-apps/systemd/systemd-243-r1.ebuild |
| 23 |
rename to sys-apps/systemd/systemd-243-r2.ebuild |
| 24 |
index 261851cf5bb..0bb00e81ae5 100644 |
| 25 |
--- a/sys-apps/systemd/systemd-243-r1.ebuild |
| 26 |
+++ b/sys-apps/systemd/systemd-243-r2.ebuild |
| 27 |
@@ -237,6 +237,7 @@ multilib_src_configure() { |
| 28 |
# make sure we get /bin:/sbin in PATH |
| 29 |
-Dsplit-usr=$(usex split-usr true false) |
| 30 |
-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" |
| 31 |
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" |
| 32 |
-Dsysvinit-path= |
| 33 |
-Dsysvrcnd-path= |
| 34 |
# Avoid infinite exec recursion, bug 642724 |
| 35 |
@@ -305,12 +306,6 @@ multilib_src_configure() { |
| 36 |
-Dstatic-libudev=$(usex static-libs true false) |
| 37 |
) |
| 38 |
|
| 39 |
- if multilib_is_native_abi; then |
| 40 |
- myconf+=( -Drootlibdir="${EPREFIX}$(usex split-usr '' /usr)/$(get_libdir)" ) |
| 41 |
- else |
| 42 |
- myconf+=( -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" ) |
| 43 |
- fi |
| 44 |
- |
| 45 |
meson_src_configure "${myconf[@]}" |
| 46 |
} |
| 47 |
|
| 48 |
@@ -370,12 +365,9 @@ multilib_src_install_all() { |
| 49 |
# Avoid breaking boot/reboot |
| 50 |
dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd |
| 51 |
dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown |
| 52 |
- |
| 53 |
- if use static-libs; then |
| 54 |
- mv "${ED}/$(get_libdir)"/lib{systemd,udev}.a "${ED}/usr/$(get_libdir)/" || die |
| 55 |
- gen_usr_ldscript lib{systemd,udev}.so |
| 56 |
- fi |
| 57 |
fi |
| 58 |
+ |
| 59 |
+ gen_usr_ldscript -a systemd udev |
| 60 |
} |
| 61 |
|
| 62 |
migrate_locale() { |
| 63 |
|
| 64 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 65 |
index 261851cf5bb..0bb00e81ae5 100644 |
| 66 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 67 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 68 |
@@ -237,6 +237,7 @@ multilib_src_configure() { |
| 69 |
# make sure we get /bin:/sbin in PATH |
| 70 |
-Dsplit-usr=$(usex split-usr true false) |
| 71 |
-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" |
| 72 |
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" |
| 73 |
-Dsysvinit-path= |
| 74 |
-Dsysvrcnd-path= |
| 75 |
# Avoid infinite exec recursion, bug 642724 |
| 76 |
@@ -305,12 +306,6 @@ multilib_src_configure() { |
| 77 |
-Dstatic-libudev=$(usex static-libs true false) |
| 78 |
) |
| 79 |
|
| 80 |
- if multilib_is_native_abi; then |
| 81 |
- myconf+=( -Drootlibdir="${EPREFIX}$(usex split-usr '' /usr)/$(get_libdir)" ) |
| 82 |
- else |
| 83 |
- myconf+=( -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" ) |
| 84 |
- fi |
| 85 |
- |
| 86 |
meson_src_configure "${myconf[@]}" |
| 87 |
} |
| 88 |
|
| 89 |
@@ -370,12 +365,9 @@ multilib_src_install_all() { |
| 90 |
# Avoid breaking boot/reboot |
| 91 |
dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd |
| 92 |
dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown |
| 93 |
- |
| 94 |
- if use static-libs; then |
| 95 |
- mv "${ED}/$(get_libdir)"/lib{systemd,udev}.a "${ED}/usr/$(get_libdir)/" || die |
| 96 |
- gen_usr_ldscript lib{systemd,udev}.so |
| 97 |
- fi |
| 98 |
fi |
| 99 |
+ |
| 100 |
+ gen_usr_ldscript -a systemd udev |
| 101 |
} |
| 102 |
|
| 103 |
migrate_locale() { |
Archives