commit: ad5fdb350d23492ea5371bc97ec23b00319c9ee3
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 26 18:32:21 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Oct 26 18:33:15 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad5fdb35
sys-fs/udev: restore static-libs support
Package-Manager: Portage-2.3.78_p4, Repoman-2.3.17_p100
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../udev/{udev-9999.ebuild => udev-243-r1.ebuild} | 21 ++++++++++++---------
sys-fs/udev/udev-9999.ebuild | 12 +++++++++---
2 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-243-r1.ebuild
similarity index 95%
copy from sys-fs/udev/udev-9999.ebuild
copy to sys-fs/udev/udev-243-r1.ebuild
index 2f93c2084c1..a6c8a04b3b0 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-243-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal
toolchain-funcs udev
+inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal
toolchain-funcs udev usr-ldscript
if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="https://github.com/systemd/systemd.git";
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd";
LICENSE="LGPL-2.1 MIT GPL-2"
SLOT="0"
-IUSE="acl +kmod selinux"
+IUSE="acl +kmod selinux static-libs"
RESTRICT="test"
@@ -96,9 +96,6 @@ src_prepare() {
eapply "${WORKDIR}/patches"
fi
- local PATCHES=(
- )
-
default
}
@@ -118,6 +115,8 @@ multilib_src_configure() {
-Dselinux=$(meson_multilib_native_use selinux)
-Dlink-udev-shared=false
-Dsplit-usr=true
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dlibudev-static=$(usex static-libs true false)
# Prevent automagic deps
-Dgcrypt=false
@@ -145,6 +144,9 @@ multilib_src_compile() {
local targets=(
src/udev/${libudev}
)
+ if use static-libs; then
+ targets+=( src/udev/libudev.a )
+ fi
if multilib_is_native_abi; then
targets+=(
systemd-udevd
@@ -168,8 +170,9 @@ multilib_src_compile() {
multilib_src_install() {
local libudev=$(readlink src/udev/libudev.so.1)
- into /
dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
+ gen_usr_ldscript -a udev
+ use static-libs && dolib.a src/udev/libudev.a
insinto "/usr/$(get_libdir)/pkgconfig"
doins src/libudev/libudev.pc
@@ -184,9 +187,9 @@ multilib_src_install() {
exeinto /lib/udev
doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id}
- rm rules.d/99-systemd.rules || die
+ rm rules/99-systemd.rules || die
insinto /lib/udev/rules.d
- doins rules.d/*.rules
+ doins rules/*.rules
insinto /usr/share/pkgconfig
doins src/udev/udev.pc
@@ -210,7 +213,7 @@ multilib_src_install_all() {
# see src_prepare() for content of 40-gentoo.rules
insinto /lib/udev/rules.d
doins "${T}"/40-gentoo.rules
- doins "${S}"/rules.d/*.rules
+ doins "${S}"/rules/*.rules
dobashcomp shell-completion/bash/udevadm
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 2f93c2084c1..327280fe808 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal
toolchain-funcs udev
+inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal
toolchain-funcs udev usr-ldscript
if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="https://github.com/systemd/systemd.git";
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd";
LICENSE="LGPL-2.1 MIT GPL-2"
SLOT="0"
-IUSE="acl +kmod selinux"
+IUSE="acl +kmod selinux static-libs"
RESTRICT="test"
@@ -118,6 +118,8 @@ multilib_src_configure() {
-Dselinux=$(meson_multilib_native_use selinux)
-Dlink-udev-shared=false
-Dsplit-usr=true
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dlibudev-static=$(usex static-libs true false)
# Prevent automagic deps
-Dgcrypt=false
@@ -145,6 +147,9 @@ multilib_src_compile() {
local targets=(
src/udev/${libudev}
)
+ if use static-libs; then
+ targets+=( src/udev/libudev.a )
+ fi
if multilib_is_native_abi; then
targets+=(
systemd-udevd
@@ -168,8 +173,9 @@ multilib_src_compile() {
multilib_src_install() {
local libudev=$(readlink src/udev/libudev.so.1)
- into /
dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
+ gen_usr_ldscript -a udev
+ use static-libs && dolib.a src/udev/libudev.a
insinto "/usr/$(get_libdir)/pkgconfig"
doins src/libudev/libudev.pc
