Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass
Date: Sat, 04 Apr 2009 18:02:36
Message-Id: E1LqACP-0000FQ-P8@stork.gentoo.org
1 grobian 09/04/04 18:02:33
2
3 Modified: multilib.eclass
4 Log:
5 backport fix from Prefix for get_libname to support AIX and FreeMiNT
6
7 Revision Changes Path
8 1.73 eclass/multilib.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.73&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.73&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?r1=1.72&r2=1.73
13
14 Index: multilib.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
17 retrieving revision 1.72
18 retrieving revision 1.73
19 diff -u -r1.72 -r1.73
20 --- multilib.eclass 20 Feb 2009 23:20:22 -0000 1.72
21 +++ multilib.eclass 4 Apr 2009 18:02:33 -0000 1.73
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2008 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.72 2009/02/20 23:20:22 vapier Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.73 2009/04/04 18:02:33 grobian Exp $
27
28 # @ECLASS: multilib.eclass
29 # @MAINTAINER:
30 @@ -518,18 +518,20 @@
31 # @FUNCTION: get_libname
32 # @USAGE: [version]
33 # @DESCRIPTION:
34 -# Returns libname with proper suffix {.so,.dylib} and optionally supplied version
35 -# for ELF/MACH-O shared objects
36 +# Returns libname with proper suffix {.so,.dylib,.dll,etc} and optionally
37 +# supplied version for the current platform identified by CHOST.
38 #
39 # Example:
40 # get_libname libfoo ${PV}
41 -# Returns: libfoo.so.${PV} (ELF) || libfoo.${PV}.dylib (MACH)
42 +# Returns: libfoo.so.${PV} (ELF) || libfoo.${PV}.dylib (MACH) || ...
43 get_libname() {
44 local libname
45 local ver=$1
46 case ${CHOST} in
47 *-cygwin|mingw*|*-mingw*) libname="dll";;
48 *-darwin*) libname="dylib";;
49 + *-aix*) libname="a";;
50 + *-mint*) libname="irrelevant";;
51 *) libname="so";;
52 esac
53
54 @@ -539,6 +541,8 @@
55 for ver in "$@" ; do
56 case ${CHOST} in
57 *-darwin*) echo ".${ver}.${libname}";;
58 + *-aix*) echo ".${libname}";;
59 + *-mint*) echo ".${libname}";;
60 *) echo ".${libname}.${ver}";;
61 esac
62 done