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 2D0F9139695 for ; Thu, 23 Feb 2017 11:22:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4552CE0CCD; Thu, 23 Feb 2017 11:22:20 +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 2054DE0CCD for ; Thu, 23 Feb 2017 11:22:19 +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 159F934163C for ; Thu, 23 Feb 2017 11:22:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 93D8151BD for ; Thu, 23 Feb 2017 11:22:16 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1487848459.0357e16dcdd8deafbf949de3faf97f195e0b4bc3.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libselinux/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libselinux/libselinux-9999.ebuild X-VCS-Directories: sys-libs/libselinux/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 0357e16dcdd8deafbf949de3faf97f195e0b4bc3 X-VCS-Branch: master Date: Thu, 23 Feb 2017 11:22:16 +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: 4a03279e-9ef8-42d0-9c49-1b9607ce3317 X-Archives-Hash: aa8e429374f93c0ebbd845434aeca2ad commit: 0357e16dcdd8deafbf949de3faf97f195e0b4bc3 Author: Jason Zaman gentoo org> AuthorDate: Thu Feb 23 03:48:39 2017 +0000 Commit: Jason Zaman gentoo org> CommitDate: Thu Feb 23 11:14:19 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0357e16d sys-libs/libselinux: update live ebuild python libs and include dir are now properly detected so dont need to pass in need to pass the path to libsepol.a Package-Manager: portage-2.3.3 sys-libs/libselinux/libselinux-9999.ebuild | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild index cc82d24f77..c7b8377eaf 100644 --- a/sys-libs/libselinux/libselinux-9999.ebuild +++ b/sys-libs/libselinux/libselinux-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 # $Id$ @@ -67,9 +67,7 @@ multilib_src_compile() { if multilib_is_native_abi && use python; then building() { - python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH emake \ - PYINC="-I${PYTHON_INCLUDEDIR}" \ LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ @@ -101,16 +99,18 @@ multilib_src_compile() { } multilib_src_install() { - emake DESTDIR="${D}" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" \ - SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ - USE_PCRE2="$(usex pcre2 y n)" \ - install + emake DESTDIR="${D}" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ + LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \ + USE_PCRE2="$(usex pcre2 y n)" \ + install if multilib_is_native_abi && use python; then installation() { emake DESTDIR="${D}" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ + LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \ USE_PCRE2="$(usex pcre2 y n)" \ install-pywrap python_optimize # bug 531638 @@ -125,6 +125,7 @@ multilib_src_install() { rm src/selinuxswig_ruby_wrap.lo emake DESTDIR="${D}" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ + LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \ RUBY=${1} \ USE_PCRE2="$(usex pcre2 y n)" \ install-rubywrap