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 AC1EC138334 for ; Sat, 26 Oct 2019 18:17:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03F24E0986; Sat, 26 Oct 2019 18:17:07 +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 D6A57E0986 for ; Sat, 26 Oct 2019 18:17:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 DA15834C3CD for ; Sat, 26 Oct 2019 18:17:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8F2397FD for ; Sat, 26 Oct 2019 18:17:04 +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: <1572113822.86e02411b44c6add8ed40c90994e6b72474dce06.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/systemd-243-r1.ebuild sys-apps/systemd/systemd-243-r2.ebuild sys-apps/systemd/systemd-9999.ebuild X-VCS-Directories: sys-apps/systemd/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 86e02411b44c6add8ed40c90994e6b72474dce06 X-VCS-Branch: master Date: Sat, 26 Oct 2019 18:17:04 +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: 62f91e57-c28a-4003-99c9-183dcdd5047b X-Archives-Hash: 07a51db85a75af3e55d32b03c5b2d070 commit: 86e02411b44c6add8ed40c90994e6b72474dce06 Author: Mike Gilbert gentoo org> AuthorDate: Sat Oct 26 18:16:20 2019 +0000 Commit: Mike Gilbert gentoo 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 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() {