| 1 | # Copyright 1999-2004 Gentoo Foundation |
1 | # Copyright 1999-2004 Gentoo Foundation |
| 2 | # Distributed under the terms of the GNU General Public License v2 |
2 | # Distributed under the terms of the GNU General Public License v2 |
| 3 | # $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.102 2004/09/16 14:05:07 usata Exp $ |
3 | # $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.103 2004/09/17 10:37:58 kugelfang Exp $ |
| 4 | # |
4 | # |
| 5 | # Author: Martin Schlemmer <azarah@gentoo.org> |
5 | # Author: Martin Schlemmer <azarah@gentoo.org> |
| 6 | # |
6 | # |
| 7 | # This eclass is for general purpose functions that most ebuilds |
7 | # This eclass is for general purpose functions that most ebuilds |
| 8 | # have to implement themselves. |
8 | # have to implement themselves. |
| … | |
… | |
| 49 | # to assume all libraries will end up in lib. Replace any (sane) instances |
49 | # to assume all libraries will end up in lib. Replace any (sane) instances |
| 50 | # where lib is named directly with $(get_libdir) if possible. |
50 | # where lib is named directly with $(get_libdir) if possible. |
| 51 | # |
51 | # |
| 52 | # Travis Tilley <lv@gentoo.org> (24 Aug 2004) |
52 | # Travis Tilley <lv@gentoo.org> (24 Aug 2004) |
| 53 | get_libdir() { |
53 | get_libdir() { |
|
|
54 | LIBDIR_TEST=$(type econf) |
| 54 | if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then |
55 | if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then |
| 55 | # if there is an override, we want to use that... always. |
56 | # if there is an override, we want to use that... always. |
| 56 | CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" |
57 | CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" |
|
|
58 | # We don't need to know the verison of portage. We only need to know |
|
|
59 | # if there is support for CONF_LIBDIR in econf and co. |
|
|
60 | # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09 |
| 57 | elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then |
61 | #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then |
| 58 | # and if there isnt an override, and we're using a version of |
62 | # # and if there isnt an override, and we're using a version of |
| 59 | # portage without CONF_LIBDIR support, force the use of lib. dolib |
63 | # # portage without CONF_LIBDIR support, force the use of lib. dolib |
| 60 | # and friends from portage 2.0.50 wont be too happy otherwise. |
64 | # # and friends from portage 2.0.50 wont be too happy otherwise. |
|
|
65 | # CONF_LIBDIR="lib" |
|
|
66 | #fi |
|
|
67 | elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support |
|
|
68 | # will be <portage-2.0.51_pre20 |
| 61 | CONF_LIBDIR="lib" |
69 | CONF_LIBDIR="lib" |
| 62 | fi |
70 | fi |
| 63 | # and of course, default to lib if CONF_LIBDIR isnt set |
71 | # and of course, default to lib if CONF_LIBDIR isnt set |
| 64 | echo ${CONF_LIBDIR:=lib} |
72 | echo ${CONF_LIBDIR:=lib} |
|
|
73 | unset LIBDIR_TEST |
| 65 | } |
74 | } |
| 66 | |
75 | |
| 67 | |
76 | |
| 68 | get_multilibdir() { |
77 | get_multilibdir() { |
| 69 | echo ${CONF_MULTILIBDIR:=lib32} |
78 | echo ${CONF_MULTILIBDIR:=lib32} |
Parent Directory
| 
Revision Log
| 
Patch