From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AE057138334 for ; Sat, 26 Oct 2019 18:33:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DADC6E0970; Sat, 26 Oct 2019 18:33:22 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9A792E0970 for ; Sat, 26 Oct 2019 18:33:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6A4DB34C38E for ; Sat, 26 Oct 2019 18:33:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0AC61894 for ; Sat, 26 Oct 2019 18:33:19 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1572114795.ad5fdb350d23492ea5371bc97ec23b00319c9ee3.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/udev/udev-243-r1.ebuild sys-fs/udev/udev-9999.ebuild X-VCS-Directories: sys-fs/udev/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: ad5fdb350d23492ea5371bc97ec23b00319c9ee3 X-VCS-Branch: master Date: Sat, 26 Oct 2019 18:33:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 42cdad86-7dcc-46b9-93c6-08971a4f5a61 X-Archives-Hash: 52bc900a962f8cc087520a73bbc9c0dd commit: ad5fdb350d23492ea5371bc97ec23b00319c9ee3 Author: Mike Gilbert gentoo org> AuthorDate: Sat Oct 26 18:32:21 2019 +0000 Commit: Mike Gilbert gentoo 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 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