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 ECA2E1395E2 for ; Sat, 5 Nov 2016 19:35:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8267EE08F8; Sat, 5 Nov 2016 19:35:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 67A8BE08F8 for ; Sat, 5 Nov 2016 19:35:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5EE9B3413AA for ; Sat, 5 Nov 2016 19:35:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7FC15249C for ; Sat, 5 Nov 2016 19:35:53 +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: <1478374549.87ea3648133394279aacfd2d2340dfca9c9ed92d.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-232-r1.ebuild sys-fs/udev/udev-232-r2.ebuild X-VCS-Directories: sys-fs/udev/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 87ea3648133394279aacfd2d2340dfca9c9ed92d X-VCS-Branch: master Date: Sat, 5 Nov 2016 19:35:53 +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: 8f1a4984-5db8-4e1c-85d1-d6c4af842fcb X-Archives-Hash: 3372c022a28a9d99d6bb54b3f912fee3 commit: 87ea3648133394279aacfd2d2340dfca9c9ed92d Author: Mike Gilbert gentoo org> AuthorDate: Sat Nov 5 19:13:00 2016 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Nov 5 19:35:49 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87ea3648 sys-fs/udev: fix libudev on non-native abis Also simplify multilib_src_install; there's no need for variables here. Package-Manager: portage-2.3.2_p4 .../{udev-232-r1.ebuild => udev-232-r2.ebuild} | 23 +++++----------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/sys-fs/udev/udev-232-r1.ebuild b/sys-fs/udev/udev-232-r2.ebuild similarity index 96% rename from sys-fs/udev/udev-232-r1.ebuild rename to sys-fs/udev/udev-232-r2.ebuild index 83e57cb..5338a7a 100644 --- a/sys-fs/udev/udev-232-r1.ebuild +++ b/sys-fs/udev/udev-232-r2.ebuild @@ -242,9 +242,6 @@ multilib_src_compile() { multilib_src_install() { if multilib_is_native_abi; then - local rootlib_LTLIBRARIES="libudev.la" - local pkgconfiglib_DATA="src/libudev/libudev.pc" - local targets=( install-includeHEADERS install-rootbinPROGRAMS @@ -259,14 +256,10 @@ multilib_src_install() { install-directories-hook install-dist_bashcompletionDATA install-dist_networkDATA - ) - - # add final values of variables: - targets+=( rootlibexec_PROGRAMS=systemd-udevd rootbin_PROGRAMS=udevadm - rootlib_LTLIBRARIES="${rootlib_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" @@ -280,21 +273,15 @@ multilib_src_install() { dosym ../../$(get_libdir)/libudev.so.1 \ /usr/$(get_libdir)/libudev.so else - local lib_LTLIBRARIES="libudev.la" - local pkgconfiglib_DATA="src/libudev/libudev.pc" - local include_HEADERS="src/libudev/libudev.h" - 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+=( - rootlib_LTLIBRARIES="${rootlib_LTLIBRARIES}" - pkgconfiglib_DATA="${pkgconfiglib_DATA}" - include_HEADERS="${include_HEADERS}" - ) emake -j1 DESTDIR="${D}" "${targets[@]}" fi }