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 DDA9A139694 for ; Sun, 30 Apr 2017 15:02:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AEF8621C0DF; Sun, 30 Apr 2017 15:02:40 +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-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8383E21C0DF for ; Sun, 30 Apr 2017 15:02:40 +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 3ECC8341659 for ; Sun, 30 Apr 2017 15:02:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A34E82494 for ; Sun, 30 Apr 2017 15:02:37 +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: <1493564554.e3360efdf3a40f5a9c8b61e2c06432cac49a1959.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-9999.ebuild X-VCS-Directories: sys-fs/udev/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: e3360efdf3a40f5a9c8b61e2c06432cac49a1959 X-VCS-Branch: master Date: Sun, 30 Apr 2017 15:02:37 +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-Archives-Salt: 062fcc76-63bc-4fdf-a38b-eaf61c16001b X-Archives-Hash: 500208c6d7988d0439916de26068e938 commit: e3360efdf3a40f5a9c8b61e2c06432cac49a1959 Author: Mike Gilbert gentoo org> AuthorDate: Sun Apr 30 14:53:02 2017 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Apr 30 15:02:34 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3360efd sys-fs/udev: sync live ebuild Package-Manager: Portage-2.3.5_p31, Repoman-2.3.2_p61 sys-fs/udev/udev-9999.ebuild | 45 +++++++++++++++----------------------------- 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index 121e2dbf260..8662d86b43c 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,7 +24,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" LICENSE="LGPL-2.1 MIT GPL-2" SLOT="0" -IUSE="acl +kmod selinux static-libs" +IUSE="acl +kmod selinux" RESTRICT="test" @@ -64,7 +64,7 @@ S=${WORKDIR}/systemd-${PV} check_default_rules() { # Make sure there are no sudden changes to upstream rules file # (more for my own needs than anything else ...) - local udev_rules_md5=b8ad860dccae0ca51656b33c405ea2ca + local udev_rules_md5=c6ee9def75c5c082bf083a7248991935 MD5=$(md5sum < "${S}"/rules/50-udev-default.rules) MD5=${MD5/ -/} if [[ ${MD5} != ${udev_rules_md5} ]]; then @@ -98,7 +98,7 @@ pkg_setup() { src_prepare() { if ! [[ ${PV} = 9999* ]]; then # secure_getenv() disable for non-glibc systems wrt bug #443030 - if ! [[ $(grep -r secure_getenv * | wc -l) -eq 26 ]]; then + if ! [[ $(grep -r secure_getenv * | wc -l) -eq 30 ]]; then eerror "The line count for secure_getenv() failed, see bug #443030" die fi @@ -130,11 +130,6 @@ src_prepare() { check_default_rules fi - # Restore possibility of running --enable-static wrt #472608 - sed -i \ - -e '/--enable-static is not supported by systemd/s:as_fn_error:echo:' \ - configure || die - if ! use elibc_glibc; then #443030 echo '#define secure_getenv(x) NULL' >> config.h.in sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die @@ -159,7 +154,6 @@ multilib_src_configure() { econf_args=( --libdir=/usr/$(get_libdir) --docdir=/usr/share/doc/${PF} - $(multilib_native_use_enable static-libs static) --disable-nls --disable-dbus $(multilib_native_use_enable kmod) @@ -245,13 +239,10 @@ multilib_src_compile() { multilib_src_install() { if multilib_is_native_abi; then - local lib_LTLIBRARIES="libudev.la" - local pkgconfiglib_DATA="src/libudev/libudev.pc" - local targets=( - install-libLTLIBRARIES install-includeHEADERS install-rootbinPROGRAMS + install-rootlibLTLIBRARIES install-rootlibexecPROGRAMS install-udevlibexecPROGRAMS install-dist_udevconfDATA @@ -259,18 +250,13 @@ multilib_src_install() { install-pkgconfiglibDATA install-pkgconfigdataDATA install-dist_docDATA - libudev-install-hook install-directories-hook install-dist_bashcompletionDATA install-dist_networkDATA - ) - - # add final values of variables: - targets+=( rootlibexec_PROGRAMS=systemd-udevd rootbin_PROGRAMS=udevadm - lib_LTLIBRARIES="${lib_LTLIBRARIES}" - pkgconfiglib_DATA="${pkgconfiglib_DATA}" + rootlib_LTLIBRARIES="libudev.la" + pkgconfiglib_DATA="src/libudev/libudev.pc" pkgconfigdata_DATA="src/udev/udev.pc" INSTALL_DIRS='$(sysconfdir)/udev/rules.d $(sysconfdir)/udev/hwdb.d $(sysconfdir)/systemd/network' dist_bashcompletion_DATA="shell-completion/bash/udevadm" @@ -278,22 +264,21 @@ multilib_src_install() { ) emake -j1 DESTDIR="${D}" "${targets[@]}" doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8} - else - local lib_LTLIBRARIES="libudev.la" - local pkgconfiglib_DATA="src/libudev/libudev.pc" - local include_HEADERS="src/libudev/libudev.h" + # Compatibility symlink for software that looks for libudev.so + # without using pkg-config + dosym ../../$(get_libdir)/libudev.so.1 \ + /usr/$(get_libdir)/libudev.so + else local targets=( install-libLTLIBRARIES install-includeHEADERS install-pkgconfiglibDATA + lib_LTLIBRARIES="libudev.la" + pkgconfiglib_DATA="src/libudev/libudev.pc" + include_HEADERS="src/libudev/libudev.h" ) - targets+=( - lib_LTLIBRARIES="${lib_LTLIBRARIES}" - pkgconfiglib_DATA="${pkgconfiglib_DATA}" - include_HEADERS="${include_HEADERS}" - ) emake -j1 DESTDIR="${D}" "${targets[@]}" fi }