From 5f48c79d3a06d61d8ceb9a7b1729a8e1ddda993b Mon Sep 17 00:00:00 2001 From: Jason Zaman Date: Mon, 28 May 2018 14:11:26 +0800 Subject: 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(-) (limited to 'app-admin/setools') diff --git a/app-admin/setools/setools-4.1.1.ebuild b/app-admin/setools/setools-4.1.1.ebuild index 5142d939a869..560eee70d249 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 bc6d48e45d58..d0836619d13f 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 -- cgit v1.2.3-65-gdbad