| 1 |
commit: ad5fdb350d23492ea5371bc97ec23b00319c9ee3 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 26 18:32:21 2019 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 26 18:33:15 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad5fdb35 |
| 7 |
|
| 8 |
sys-fs/udev: restore static-libs support |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.78_p4, Repoman-2.3.17_p100 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
.../udev/{udev-9999.ebuild => udev-243-r1.ebuild} | 21 ++++++++++++--------- |
| 14 |
sys-fs/udev/udev-9999.ebuild | 12 +++++++++--- |
| 15 |
2 files changed, 21 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-243-r1.ebuild |
| 18 |
similarity index 95% |
| 19 |
copy from sys-fs/udev/udev-9999.ebuild |
| 20 |
copy to sys-fs/udev/udev-243-r1.ebuild |
| 21 |
index 2f93c2084c1..a6c8a04b3b0 100644 |
| 22 |
--- a/sys-fs/udev/udev-9999.ebuild |
| 23 |
+++ b/sys-fs/udev/udev-243-r1.ebuild |
| 24 |
@@ -3,7 +3,7 @@ |
| 25 |
|
| 26 |
EAPI=6 |
| 27 |
|
| 28 |
-inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev |
| 29 |
+inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev usr-ldscript |
| 30 |
|
| 31 |
if [[ ${PV} = 9999* ]]; then |
| 32 |
EGIT_REPO_URI="https://github.com/systemd/systemd.git" |
| 33 |
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" |
| 34 |
|
| 35 |
LICENSE="LGPL-2.1 MIT GPL-2" |
| 36 |
SLOT="0" |
| 37 |
-IUSE="acl +kmod selinux" |
| 38 |
+IUSE="acl +kmod selinux static-libs" |
| 39 |
|
| 40 |
RESTRICT="test" |
| 41 |
|
| 42 |
@@ -96,9 +96,6 @@ src_prepare() { |
| 43 |
eapply "${WORKDIR}/patches" |
| 44 |
fi |
| 45 |
|
| 46 |
- local PATCHES=( |
| 47 |
- ) |
| 48 |
- |
| 49 |
default |
| 50 |
} |
| 51 |
|
| 52 |
@@ -118,6 +115,8 @@ multilib_src_configure() { |
| 53 |
-Dselinux=$(meson_multilib_native_use selinux) |
| 54 |
-Dlink-udev-shared=false |
| 55 |
-Dsplit-usr=true |
| 56 |
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" |
| 57 |
+ -Dlibudev-static=$(usex static-libs true false) |
| 58 |
|
| 59 |
# Prevent automagic deps |
| 60 |
-Dgcrypt=false |
| 61 |
@@ -145,6 +144,9 @@ multilib_src_compile() { |
| 62 |
local targets=( |
| 63 |
src/udev/${libudev} |
| 64 |
) |
| 65 |
+ if use static-libs; then |
| 66 |
+ targets+=( src/udev/libudev.a ) |
| 67 |
+ fi |
| 68 |
if multilib_is_native_abi; then |
| 69 |
targets+=( |
| 70 |
systemd-udevd |
| 71 |
@@ -168,8 +170,9 @@ multilib_src_compile() { |
| 72 |
multilib_src_install() { |
| 73 |
local libudev=$(readlink src/udev/libudev.so.1) |
| 74 |
|
| 75 |
- into / |
| 76 |
dolib.so src/udev/{${libudev},libudev.so.1,libudev.so} |
| 77 |
+ gen_usr_ldscript -a udev |
| 78 |
+ use static-libs && dolib.a src/udev/libudev.a |
| 79 |
|
| 80 |
insinto "/usr/$(get_libdir)/pkgconfig" |
| 81 |
doins src/libudev/libudev.pc |
| 82 |
@@ -184,9 +187,9 @@ multilib_src_install() { |
| 83 |
exeinto /lib/udev |
| 84 |
doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id} |
| 85 |
|
| 86 |
- rm rules.d/99-systemd.rules || die |
| 87 |
+ rm rules/99-systemd.rules || die |
| 88 |
insinto /lib/udev/rules.d |
| 89 |
- doins rules.d/*.rules |
| 90 |
+ doins rules/*.rules |
| 91 |
|
| 92 |
insinto /usr/share/pkgconfig |
| 93 |
doins src/udev/udev.pc |
| 94 |
@@ -210,7 +213,7 @@ multilib_src_install_all() { |
| 95 |
# see src_prepare() for content of 40-gentoo.rules |
| 96 |
insinto /lib/udev/rules.d |
| 97 |
doins "${T}"/40-gentoo.rules |
| 98 |
- doins "${S}"/rules.d/*.rules |
| 99 |
+ doins "${S}"/rules/*.rules |
| 100 |
|
| 101 |
dobashcomp shell-completion/bash/udevadm |
| 102 |
|
| 103 |
|
| 104 |
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild |
| 105 |
index 2f93c2084c1..327280fe808 100644 |
| 106 |
--- a/sys-fs/udev/udev-9999.ebuild |
| 107 |
+++ b/sys-fs/udev/udev-9999.ebuild |
| 108 |
@@ -3,7 +3,7 @@ |
| 109 |
|
| 110 |
EAPI=6 |
| 111 |
|
| 112 |
-inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev |
| 113 |
+inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev usr-ldscript |
| 114 |
|
| 115 |
if [[ ${PV} = 9999* ]]; then |
| 116 |
EGIT_REPO_URI="https://github.com/systemd/systemd.git" |
| 117 |
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" |
| 118 |
|
| 119 |
LICENSE="LGPL-2.1 MIT GPL-2" |
| 120 |
SLOT="0" |
| 121 |
-IUSE="acl +kmod selinux" |
| 122 |
+IUSE="acl +kmod selinux static-libs" |
| 123 |
|
| 124 |
RESTRICT="test" |
| 125 |
|
| 126 |
@@ -118,6 +118,8 @@ multilib_src_configure() { |
| 127 |
-Dselinux=$(meson_multilib_native_use selinux) |
| 128 |
-Dlink-udev-shared=false |
| 129 |
-Dsplit-usr=true |
| 130 |
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" |
| 131 |
+ -Dlibudev-static=$(usex static-libs true false) |
| 132 |
|
| 133 |
# Prevent automagic deps |
| 134 |
-Dgcrypt=false |
| 135 |
@@ -145,6 +147,9 @@ multilib_src_compile() { |
| 136 |
local targets=( |
| 137 |
src/udev/${libudev} |
| 138 |
) |
| 139 |
+ if use static-libs; then |
| 140 |
+ targets+=( src/udev/libudev.a ) |
| 141 |
+ fi |
| 142 |
if multilib_is_native_abi; then |
| 143 |
targets+=( |
| 144 |
systemd-udevd |
| 145 |
@@ -168,8 +173,9 @@ multilib_src_compile() { |
| 146 |
multilib_src_install() { |
| 147 |
local libudev=$(readlink src/udev/libudev.so.1) |
| 148 |
|
| 149 |
- into / |
| 150 |
dolib.so src/udev/{${libudev},libudev.so.1,libudev.so} |
| 151 |
+ gen_usr_ldscript -a udev |
| 152 |
+ use static-libs && dolib.a src/udev/libudev.a |
| 153 |
|
| 154 |
insinto "/usr/$(get_libdir)/pkgconfig" |
| 155 |
doins src/libudev/libudev.pc |
Archives