From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1026737-garchives=archives.gentoo.org@lists.gentoo.org>
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 19739138330
for <garchives@archives.gentoo.org>; Mon, 28 May 2018 09:32:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 169C1E0835;
Mon, 28 May 2018 09:32:37 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 E5A85E0835
for <gentoo-commits@lists.gentoo.org>; Mon, 28 May 2018 09:32:36 +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 C155F335C43
for <gentoo-commits@lists.gentoo.org>; Mon, 28 May 2018 09:32:35 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D30E2A8
for <gentoo-commits@lists.gentoo.org>; Mon, 28 May 2018 09:32:34 +0000 (UTC)
From: "Jason Zaman" <perfinion@gentoo.org>
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" <perfinion@gentoo.org>
Message-ID: <1527499928.5f48c79d3a06d61d8ceb9a7b1729a8e1ddda993b.perfinion@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-admin/setools/setools-4.1.1.ebuild app-admin/setools/setools-9999.ebuild
X-VCS-Directories: app-admin/setools/
X-VCS-Committer: perfinion
X-VCS-Committer-Name: Jason Zaman
X-VCS-Revision: 5f48c79d3a06d61d8ceb9a7b1729a8e1ddda993b
X-VCS-Branch: master
Date: Mon, 28 May 2018 09:32:34 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: aebea3ae-9040-4ebe-8175-9c339ddb39d1
X-Archives-Hash: e8052385f19b7cb8c4bf9786dcb51194
commit: 5f48c79d3a06d61d8ceb9a7b1729a8e1ddda993b
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Mon May 28 06:11:26 2018 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Mon May 28 09:32:08 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f48c79d
app-admin/setools: respect libdir when cross compiling
Bug: https://bugs.gentoo.org/638286
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-admin/setools/setools-4.1.1.ebuild | 2 +-
app-admin/setools/setools-9999.ebuild | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app-admin/setools/setools-4.1.1.ebuild b/app-admin/setools/setools-4.1.1.ebuild
index 5142d939a86..560eee70d24 100644
--- a/app-admin/setools/setools-4.1.1.ebuild
+++ b/app-admin/setools/setools-4.1.1.ebuild
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
python_prepare_all() {
sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
- sed -i "s@^base_lib_dirs = .*@base_lib_dirs = ['${ROOT:-/}usr/lib','${ROOT:-/}usr/lib64']@g" "${S}"/setup.py || \
+ sed -i "s@^base_lib_dirs = .*@base_lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@g" "${S}"/setup.py || \
die "failed to set base_lib_dirs"
use X || local PATCHES=( "${FILESDIR}"/setools-4.1.1-remove-gui.patch )
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index bc6d48e45d5..d0836619d13 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git"
else
SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
fi
LICENSE="GPL-2 LGPL-2.1"
@@ -44,6 +44,8 @@ DEPEND="${RDEPEND}
python_prepare_all() {
sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
+ sed -i "s@^base_lib_dirs = .*@base_lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@g" "${S}"/setup.py || \
+ die "failed to set base_lib_dirs"
use X || local PATCHES=( "${FILESDIR}"/setools-4.1.1-remove-gui.patch )
distutils-r1_python_prepare_all