[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michael Haubenwallner]

commit:     e82fb848a715057de637559c889aebdce819ccfa
Author:     Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer 
<DOT> com>
AuthorDate: Tue Apr 12 11:54:59 2016 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 09:33:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e82fb848

multilib.eclass (get_libname): Cygwin uses (unversioned) import libs named dll.a

 eclass/multilib.eclass | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 69582b6..d1c19ff 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -238,11 +238,12 @@ get_libname() {
        local libname
        local ver=$1
        case ${CHOST} in
-               *-cygwin|mingw*|*-mingw*) libname="dll";;
-               *-darwin*)                libname="dylib";;
-               *-mint*)                  libname="irrelevant";;
-               hppa*-hpux*)              libname="sl";;
-               *)                        libname="so";;
+               *-cygwin*)       libname="dll.a";; # import lib
+               mingw*|*-mingw*) libname="dll";;
+               *-darwin*)       libname="dylib";;
+               *-mint*)         libname="irrelevant";;
+               hppa*-hpux*)     libname="sl";;
+               *)               libname="so";;
        esac
 
        if [[ -z $* ]] ; then
@@ -250,6 +251,7 @@ get_libname() {
        else
                for ver in "$@" ; do
                        case ${CHOST} in
+                               *-cygwin*) echo ".${libname}";;
                                *-darwin*) echo ".${ver}.${libname}";;
                                *-mint*)   echo ".${libname}";;
                                *)         echo ".${libname}.${ver}";;