| 1 |
commit: 5f48c79d3a06d61d8ceb9a7b1729a8e1ddda993b |
| 2 |
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 28 06:11:26 2018 +0000 |
| 4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 28 09:32:08 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f48c79d |
| 7 |
|
| 8 |
app-admin/setools: respect libdir when cross compiling |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/638286 |
| 11 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 12 |
|
| 13 |
app-admin/setools/setools-4.1.1.ebuild | 2 +- |
| 14 |
app-admin/setools/setools-9999.ebuild | 4 +++- |
| 15 |
2 files changed, 4 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-admin/setools/setools-4.1.1.ebuild b/app-admin/setools/setools-4.1.1.ebuild |
| 18 |
index 5142d939a86..560eee70d24 100644 |
| 19 |
--- a/app-admin/setools/setools-4.1.1.ebuild |
| 20 |
+++ b/app-admin/setools/setools-4.1.1.ebuild |
| 21 |
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND} |
| 22 |
|
| 23 |
python_prepare_all() { |
| 24 |
sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror" |
| 25 |
- sed -i "s@^base_lib_dirs = .*@base_lib_dirs = ['${ROOT:-/}usr/lib','${ROOT:-/}usr/lib64']@g" "${S}"/setup.py || \ |
| 26 |
+ sed -i "s@^base_lib_dirs = .*@base_lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@g" "${S}"/setup.py || \ |
| 27 |
die "failed to set base_lib_dirs" |
| 28 |
|
| 29 |
use X || local PATCHES=( "${FILESDIR}"/setools-4.1.1-remove-gui.patch ) |
| 30 |
|
| 31 |
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild |
| 32 |
index bc6d48e45d5..d0836619d13 100644 |
| 33 |
--- a/app-admin/setools/setools-9999.ebuild |
| 34 |
+++ b/app-admin/setools/setools-9999.ebuild |
| 35 |
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then |
| 36 |
EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git" |
| 37 |
else |
| 38 |
SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 39 |
- KEYWORDS="~amd64 ~x86" |
| 40 |
+ KEYWORDS="~amd64 ~arm64 ~x86" |
| 41 |
fi |
| 42 |
|
| 43 |
LICENSE="GPL-2 LGPL-2.1" |
| 44 |
@@ -44,6 +44,8 @@ DEPEND="${RDEPEND} |
| 45 |
|
| 46 |
python_prepare_all() { |
| 47 |
sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror" |
| 48 |
+ sed -i "s@^base_lib_dirs = .*@base_lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@g" "${S}"/setup.py || \ |
| 49 |
+ die "failed to set base_lib_dirs" |
| 50 |
|
| 51 |
use X || local PATCHES=( "${FILESDIR}"/setools-4.1.1-remove-gui.patch ) |
| 52 |
distutils-r1_python_prepare_all |
Archives