summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Andrews <candrews@gentoo.org>2017-08-27 23:09:25 -0400
committerCraig Andrews <candrews@gentoo.org>2017-08-27 23:11:29 -0400
commit3e7c65e7104c14064f8cf6c9d5073bc3974197f7 (patch)
tree8b3510bf42653ec78b4ecf6a194b5d22271a5beb /dev-cpp
parentdev-cpp/waylandpp: Fix multilib-strict workaround on non-multilib systems (diff)
downloadgentoo-3e7c65e7104c14064f8cf6c9d5073bc3974197f7.tar.gz
gentoo-3e7c65e7104c14064f8cf6c9d5073bc3974197f7.tar.bz2
gentoo-3e7c65e7104c14064f8cf6c9d5073bc3974197f7.zip
dev-cpp/waylandpp: Fix multilib-strict workaround on non-multilib systems
The first attempt missed a couple of places where "lib" was hardcoded. Gentoo-bug: 629110 Package-Manager: Portage-2.3.8, Repoman-2.3.3
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/waylandpp/waylandpp-0.1.0.ebuild3
-rw-r--r--dev-cpp/waylandpp/waylandpp-9999.ebuild3
2 files changed, 2 insertions, 4 deletions
diff --git a/dev-cpp/waylandpp/waylandpp-0.1.0.ebuild b/dev-cpp/waylandpp/waylandpp-0.1.0.ebuild
index ec39b8bc686..112c1a2776d 100644
--- a/dev-cpp/waylandpp/waylandpp-0.1.0.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-0.1.0.ebuild
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
src_prepare() {
default
- sed -i -e "s:\$\${prefix}/lib:/usr/$(get_libdir):" SConstruct || die
+ 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
}
src_compile() {
@@ -46,7 +46,6 @@ src_compile() {
src_install() {
CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${D%/}/usr" escons install
# fix multilib-strict QA failures
- mv "${ED%/}"/usr/{lib,$(get_libdir)} || die
if use doc; then
doman doc/man/man3/*.3
local HTML_DOCS=( doc/html )
diff --git a/dev-cpp/waylandpp/waylandpp-9999.ebuild b/dev-cpp/waylandpp/waylandpp-9999.ebuild
index ec39b8bc686..112c1a2776d 100644
--- a/dev-cpp/waylandpp/waylandpp-9999.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-9999.ebuild
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
src_prepare() {
default
- sed -i -e "s:\$\${prefix}/lib:/usr/$(get_libdir):" SConstruct || die
+ 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
}
src_compile() {
@@ -46,7 +46,6 @@ src_compile() {
src_install() {
CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${D%/}/usr" escons install
# fix multilib-strict QA failures
- mv "${ED%/}"/usr/{lib,$(get_libdir)} || die
if use doc; then
doman doc/man/man3/*.3
local HTML_DOCS=( doc/html )