diff options
| author |   Ciaran McCreesh <ciaranm@gentoo.org> | 2005-05-07 16:45:47 +0000 |
|---|---|---|
| committer | Ciaran McCreesh <ciaranm@gentoo.org> | 2005-05-07 16:45:47 +0000 |
| commit | b46677d4119ffe6c11b59e89e7e0c53a889e3b1a (patch) | |
| tree | be2e90b1d9043be3dcd5659a4f5fb881bd74e81c | |
| parent | fix bug in has (diff) | |
| download | eselect-b46677d4119ffe6c11b59e89e7e0c53a889e3b1a.tar.gz eselect-b46677d4119ffe6c11b59e89e7e0c53a889e3b1a.tar.bz2 eselect-b46677d4119ffe6c11b59e89e7e0c53a889e3b1a.zip | |
update things to new has syntax
svn path=/trunk/; revision=33
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | modules/blas.eclectic | 12 | ||||
| -rw-r--r-- | modules/lapack.eclectic | 12 |
3 files changed, 16 insertions, 13 deletions
@@ -1,7 +1,10 @@ ChangeLog for eclectic 2005-05-07 Ciaran McCreesh <ciaranm@gentoo.org> - * libs/core.bash.in: Fix bug in has so that it actually works. + * libs/core.bash.in: Fix bug in has so that it is consistent with + portage syntax. + * modules/blas.eclectic, modules/lapack.eclectic: Update to new has + syntax. 2005-05-07 Aaron Walker <ka0ttic@gentoo.org> diff --git a/modules/blas.eclectic b/modules/blas.eclectic index 46dff96..750f4c1 100644 --- a/modules/blas.eclectic +++ b/modules/blas.eclectic @@ -175,14 +175,14 @@ do_set() { impl=${1} shift - has "BLAS_IMPLEMENTATIONS" ${impl} \ + has "${BLAS_IMPLEMENTATIONS}" ${impl} \ || die -q "Illegal implementation: ${impl}" for param in ${@} ; do echo "param: ${param}" - if has "libdirs" ${param} ; then + if has "${libdirs}" ${param} ; then mylibdirs=(${mylibdirs[@]} ${param}) - elif has "BLAS_PROFILES" ${param} ; then + elif has "${BLAS_PROFILES}" ${param} ; then myprofiles=(${myprofiles[@]} ${param}) else die -q "Illegal parameter: ${param}." @@ -211,8 +211,8 @@ describe_show() { do_show() { local libdirs=$(list_libdirs) profiles=${BLAS_PROFILES} libdir lib prefix - [[ -n ${1} ]] && has "libdirs" ${1} && libdirs=${1} - [[ -n ${2} ]] && has "profiles" ${2} && profiles=${2} + [[ -n ${1} ]] && has "${libdirs}" ${1} && libdirs=${1} + [[ -n ${2} ]] && has "${profiles}" ${2} && profiles=${2} write_list_start "Active BLAS implementations" for libdir in ${libdirs} ; do [[ ${#libdirs} -eq 1 ]] || prefix="${ROOT}/usr/${libdir}" @@ -248,7 +248,7 @@ do_update() { [[ -e ${ROOT}/usr/${libdir}/ ]] || continue for impl in ${BLAS_IMPLEMENTATIONS} ; do for prof in $(check_${impl} ${ROOT}/usr/${libdir}/) ; do - if has "BLAS_PROFILES" ${prof} ; then + if has "${BLAS_PROFILES}" ${prof} ; then add_config blas "${prof}_${libdir}" ${impl} [[ ${prof} == C ]] && lib=${ROOT}/usr/${libdir}/libcblas.so [[ ${prof} == F77 ]] && lib=${ROOT}/usr/${libdir}/libblas.so diff --git a/modules/lapack.eclectic b/modules/lapack.eclectic index 4f2a11e..55e9bef 100644 --- a/modules/lapack.eclectic +++ b/modules/lapack.eclectic @@ -137,14 +137,14 @@ do_set() { impl=${1} shift - has "LAPACK_IMPLEMENTATIONS" ${impl} \ + has "${LAPACK_IMPLEMENTATIONS}" ${impl} \ || die -q "Illegal implementation: ${impl}" for param in ${@} ; do echo "param: ${param}" - if has "libdirs" ${param} ; then + if has "${libdirs}" ${param} ; then mylibdirs=(${mylibdirs[@]} ${param}) - elif has "LAPACK_PROFILES" ${param} ; then + elif has "${LAPACK_PROFILES}" ${param} ; then myprofiles=(${myprofiles[@]} ${param}) else die -q "Illegal parameter: ${param}." @@ -173,8 +173,8 @@ describe_show() { do_show() { local libdirs=$(list_libdirs) profiles=${LAPACK_PROFILES} libdir lib prefix - [[ -n ${1} ]] && has "libdirs" ${1} && libdirs=${1} - [[ -n ${2} ]] && has "profiles" ${1} && profiles=${1} + [[ -n ${1} ]] && has "${libdirs}" ${1} && libdirs=${1} + [[ -n ${2} ]] && has "${profiles}" ${1} && profiles=${1} write_list_start "Active LAPACK implementations" for libdir in ${libdirs} ; do [[ ${#libdirs} -eq 1 ]] || prefix="${ROOT}/usr/${libdir}" @@ -210,7 +210,7 @@ do_update() { [[ -e ${ROOT}/usr/${libdir}/ ]] || continue for impl in ${LAPACK_IMPLEMENTATIONS} ; do for prof in $(check_${impl} ${ROOT}/usr/${libdir}/) ; do - if has "LAPACK_PROFILES" ${prof} ; then + if has "${LAPACK_PROFILES}" ${prof} ; then add_config lapack "${prof}_${libdir}" ${impl} [[ ${prof} == F77 ]] && lib=${ROOT}/usr/${libdir}/liblapack.so is_active_${impl} ${lib} \ |