commit:     fe687c9d5a1b80711081933b86da2624259b7b3a
Author:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 18:31:11 2018 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Tue Mar 20 06:28:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe687c9d

sys-devel/clang: fix for prefix, bug 649732

Closes: https://bugs.gentoo.org/649732
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-devel/clang/clang-4.0.1.ebuild    | 8 +++++++-
 sys-devel/clang/clang-5.0.1.ebuild    | 6 ++++++
 sys-devel/clang/clang-6.0.0.ebuild    | 6 ++++++
 sys-devel/clang/clang-6.0.9999.ebuild | 6 ++++++
 sys-devel/clang/clang-9999.ebuild     | 6 ++++++
 5 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/sys-devel/clang/clang-4.0.1.ebuild 
b/sys-devel/clang/clang-4.0.1.ebuild
index 6c37d1fd959..e3cdd3ce84a 100644
--- a/sys-devel/clang/clang-4.0.1.ebuild
+++ b/sys-devel/clang/clang-4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -164,6 +164,12 @@ multilib_src_configure() {
                )
        fi
 
+       if [[ -n ${EPREFIX} ]]; then
+               mycmakeargs+=(
+                       -DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+               )
+       fi
+
        if tc-is-cross-compiler; then
                [[ -x "/usr/bin/clang-tblgen" ]] \
                        || die "/usr/bin/clang-tblgen not found or usable"

diff --git a/sys-devel/clang/clang-5.0.1.ebuild 
b/sys-devel/clang/clang-5.0.1.ebuild
index 4c30e033af7..b16d9564915 100644
--- a/sys-devel/clang/clang-5.0.1.ebuild
+++ b/sys-devel/clang/clang-5.0.1.ebuild
@@ -178,6 +178,12 @@ multilib_src_configure() {
                )
        fi
 
+       if [[ -n ${EPREFIX} ]]; then
+               mycmakeargs+=(
+                       -DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+               )
+       fi
+
        if tc-is-cross-compiler; then
                [[ -x "/usr/bin/clang-tblgen" ]] \
                        || die "/usr/bin/clang-tblgen not found or usable"

diff --git a/sys-devel/clang/clang-6.0.0.ebuild 
b/sys-devel/clang/clang-6.0.0.ebuild
index 7e999919816..e819506ad55 100644
--- a/sys-devel/clang/clang-6.0.0.ebuild
+++ b/sys-devel/clang/clang-6.0.0.ebuild
@@ -179,6 +179,12 @@ multilib_src_configure() {
                )
        fi
 
+       if [[ -n ${EPREFIX} ]]; then
+               mycmakeargs+=(
+                       -DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+               )
+       fi
+
        if tc-is-cross-compiler; then
                [[ -x "/usr/bin/clang-tblgen" ]] \
                        || die "/usr/bin/clang-tblgen not found or usable"

diff --git a/sys-devel/clang/clang-6.0.9999.ebuild 
b/sys-devel/clang/clang-6.0.9999.ebuild
index dc710183291..509b47b788f 100644
--- a/sys-devel/clang/clang-6.0.9999.ebuild
+++ b/sys-devel/clang/clang-6.0.9999.ebuild
@@ -164,6 +164,12 @@ multilib_src_configure() {
                )
        fi
 
+       if [[ -n ${EPREFIX} ]]; then
+               mycmakeargs+=(
+                       -DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+               )
+       fi
+
        if tc-is-cross-compiler; then
                [[ -x "/usr/bin/clang-tblgen" ]] \
                        || die "/usr/bin/clang-tblgen not found or usable"

diff --git a/sys-devel/clang/clang-9999.ebuild 
b/sys-devel/clang/clang-9999.ebuild
index 0014ecde46b..10c2dbd94ce 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -165,6 +165,12 @@ multilib_src_configure() {
                )
        fi
 
+       if [[ -n ${EPREFIX} ]]; then
+               mycmakeargs+=(
+                       -DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+               )
+       fi
+
        if tc-is-cross-compiler; then
                [[ -x "/usr/bin/clang-tblgen" ]] \
                        || die "/usr/bin/clang-tblgen not found or usable"

Reply via email to