| 1 |
commit: 3e7c65e7104c14064f8cf6c9d5073bc3974197f7 |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 28 03:09:25 2017 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 28 03:11:29 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e7c65e7 |
| 7 |
|
| 8 |
dev-cpp/waylandpp: Fix multilib-strict workaround on non-multilib systems |
| 9 |
|
| 10 |
The first attempt missed a couple of places where "lib" was hardcoded. |
| 11 |
|
| 12 |
Gentoo-bug: 629110 |
| 13 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
| 14 |
|
| 15 |
dev-cpp/waylandpp/waylandpp-0.1.0.ebuild | 3 +-- |
| 16 |
dev-cpp/waylandpp/waylandpp-9999.ebuild | 3 +-- |
| 17 |
2 files changed, 2 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-cpp/waylandpp/waylandpp-0.1.0.ebuild b/dev-cpp/waylandpp/waylandpp-0.1.0.ebuild |
| 20 |
index ec39b8bc686..112c1a2776d 100644 |
| 21 |
--- a/dev-cpp/waylandpp/waylandpp-0.1.0.ebuild |
| 22 |
+++ b/dev-cpp/waylandpp/waylandpp-0.1.0.ebuild |
| 23 |
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND} |
| 24 |
|
| 25 |
src_prepare() { |
| 26 |
default |
| 27 |
- sed -i -e "s:\$\${prefix}/lib:/usr/$(get_libdir):" SConstruct || die |
| 28 |
+ sed -i -e "s:\$\${prefix}/lib:$\${prefix}/$(get_libdir):" -e "s:os.path.join(prefix, \"lib\":os.path.join(prefix, \"$(get_libdir)\":g" SConstruct || die |
| 29 |
} |
| 30 |
|
| 31 |
src_compile() { |
| 32 |
@@ -46,7 +46,6 @@ src_compile() { |
| 33 |
src_install() { |
| 34 |
CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${D%/}/usr" escons install |
| 35 |
# fix multilib-strict QA failures |
| 36 |
- mv "${ED%/}"/usr/{lib,$(get_libdir)} || die |
| 37 |
if use doc; then |
| 38 |
doman doc/man/man3/*.3 |
| 39 |
local HTML_DOCS=( doc/html ) |
| 40 |
|
| 41 |
diff --git a/dev-cpp/waylandpp/waylandpp-9999.ebuild b/dev-cpp/waylandpp/waylandpp-9999.ebuild |
| 42 |
index ec39b8bc686..112c1a2776d 100644 |
| 43 |
--- a/dev-cpp/waylandpp/waylandpp-9999.ebuild |
| 44 |
+++ b/dev-cpp/waylandpp/waylandpp-9999.ebuild |
| 45 |
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND} |
| 46 |
|
| 47 |
src_prepare() { |
| 48 |
default |
| 49 |
- sed -i -e "s:\$\${prefix}/lib:/usr/$(get_libdir):" SConstruct || die |
| 50 |
+ sed -i -e "s:\$\${prefix}/lib:$\${prefix}/$(get_libdir):" -e "s:os.path.join(prefix, \"lib\":os.path.join(prefix, \"$(get_libdir)\":g" SConstruct || die |
| 51 |
} |
| 52 |
|
| 53 |
src_compile() { |
| 54 |
@@ -46,7 +46,6 @@ src_compile() { |
| 55 |
src_install() { |
| 56 |
CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${D%/}/usr" escons install |
| 57 |
# fix multilib-strict QA failures |
| 58 |
- mv "${ED%/}"/usr/{lib,$(get_libdir)} || die |
| 59 |
if use doc; then |
| 60 |
doman doc/man/man3/*.3 |
| 61 |
local HTML_DOCS=( doc/html ) |
Archives