commit:     fa0fcf95afedb0025996c25bc1f976acdcc5d8ef
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu Jun 16 13:51:42 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Jun 17 00:35:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fa0fcf95

sys-cluster/scalasca: export more variables

Bug: https://bugs.gentoo.org/852041
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 sys-cluster/scalasca/scalasca-2.6.ebuild | 47 ++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/sys-cluster/scalasca/scalasca-2.6.ebuild 
b/sys-cluster/scalasca/scalasca-2.6.ebuild
index 64dd29d61..20b391727 100644
--- a/sys-cluster/scalasca/scalasca-2.6.ebuild
+++ b/sys-cluster/scalasca/scalasca-2.6.ebuild
@@ -36,25 +36,50 @@ src_prepare() {
 }
 
 src_configure() {
-       tc-export CC CXX FC F77 CPP
+       tc-export CC CXX FC F77 CPP AR
 
-       export MPICC=/usr/bin/mpicc
-       export MPICXX=/usr/bin/mpicxx
-       export MPIF77=/usr/bin/mpif77
-       export MPIFC=/usr/bin/mpifc
+       cat > build-config/common/platforms/platform-backend-user-provided 
<<-EOF || die
+       CC=${CC}
+       CXX=${CXX}
+       FC=${FC}
+       F77=${F77}
+       CPP=${CPP}
+       CXXCPP=${CPP}
+       EOF
 
-       export MPI_CFLAGS="${CFLAGS}"
-       export MPI_CXXFLAGS="${CXXFLAGS}"
-       export MPI_CPPFLAGS="${CPPFLAGS}"
-       export MPI_F77LAGS="${F77FLAGS}"
-       export MPI_FCLAGS="${FCFLAGS}"
-       export MPI_LDFLAGS="${LDFLAGS}"
+       cat > build-config/common/platforms/platform-frontend-user-provided 
<<-EOF || die
+       CC_FOR_BUILD=${CC}
+       F77_FOR_BUILD=${F77}
+       FC_FOR_BUILD=${FC}
+       CXX_FOR_BUILD=${CXX}
+       LDFLAGS_FOR_BUILD=${LDFLAGS}
+       CFLAGS_FOR_BUILD=${CFLAGS}
+       CXXFLAGS_FOR_BUILD=${CXXFLAGS}
+       CPPFLAGS_FOR_BUILD=${CPPFLAGS}
+       FCFLAGS_FOR_BUILD=${FCFLAGS}
+       FFLAGS_FOR_BUILD=${FFLAGS}
+       CXXFLAGS_FOR_BUILD_SCORE=${CXXFLAGS}
+       EOF
+
+       cat > build-config/common/platforms/platform-mpi-user-provided <<-EOF 
|| die
+       MPICC=mpicc
+       MPICXX=mpicxx
+       MPIF77=mpif77
+       MPIFC=mpif90
+       MPI_CPPFLAGS=${CPPFLAGS}
+       MPI_CFLAGS=${CFLAGS}
+       MPI_CXXFLAGS=${CXXFLAGS}
+       MPI_FFLAGS=${FFLAGS}
+       MPI_FCFLAGS=${FCFLAGS}
+       MPI_LDFLAGS=${LDFLAGS}
+       EOF
 
        local myconf=(
                --disable-platform-mic
                --disable-static
                --enable-shared
                --with-cubew="${EPREFIX}/usr"
+               --with-custom-compilers
                --with-libz="${EPREFIX}/usr"
                --with-otf2="${EPREFIX}/usr"
                $(use_enable openmp)

Reply via email to