| 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/multilib.eclass,v 1.2 2005/01/12 11:13:28 eradicator Exp $ |
3 | # $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.3 2005/01/12 12:03:46 eradicator Exp $ |
| 4 | # |
4 | # |
| 5 | # Author: Jeremy Huddleston <eradicator@gentoo.org> |
5 | # Author: Jeremy Huddleston <eradicator@gentoo.org> |
| 6 | # |
6 | # |
| 7 | # This eclass is for all functions pertaining to handling multilib. |
7 | # This eclass is for all functions pertaining to handling multilib. |
| 8 | # configurations. |
8 | # configurations. |
| … | |
… | |
| 214 | if is_final_abi; then |
214 | if is_final_abi; then |
| 215 | for dir in ${dirs}; do |
215 | for dir in ${dirs}; do |
| 216 | local args="${dir}" |
216 | local args="${dir}" |
| 217 | local abi |
217 | local abi |
| 218 | for abi in $(get_abi_order); do |
218 | for abi in $(get_abi_order); do |
| 219 | args="${args} $(get_abi_CDEFINE ${abi})${dir}.${abi}" |
219 | args="${args} $(get_abi_CDEFINE ${abi}):${dir}.${abi}" |
| 220 | done |
220 | done |
| 221 | create_ml_includes ${args} |
221 | create_ml_includes ${args} |
| 222 | done |
222 | done |
| 223 | fi |
223 | fi |
| 224 | fi |
224 | fi |
| … | |
… | |
| 270 | # TODO: This needs to be updated to spit out relative paths... |
270 | # TODO: This needs to be updated to spit out relative paths... |
| 271 | create_ml_includes-relative_between() { |
271 | create_ml_includes-relative_between() { |
| 272 | local from=${1} |
272 | local from=${1} |
| 273 | local to=${2} |
273 | local to=${2} |
| 274 | |
274 | |
| 275 | echo "${ROOT}${to}" |
275 | strip_duplicate_slashes "${ROOT}${to}" |
|
|
276 | } |
|
|
277 | |
|
|
278 | # Helper function for create_ml_includes |
|
|
279 | strip_duplicate_slashes () { |
|
|
280 | if [ -n "${1}" ]; then |
|
|
281 | local removed=${1/\/\//\/} |
|
|
282 | [ ${removed} != ${removed/\/\//\/} ] && removed=$(strip_duplicate_slashes "${removed}") |
|
|
283 | echo ${removed} |
|
|
284 | fi |
| 276 | } |
285 | } |
| 277 | |
286 | |
| 278 | # Helper function for create_ml_includes |
287 | # Helper function for create_ml_includes |
| 279 | create_ml_includes-listdirs() { |
288 | create_ml_includes-listdirs() { |
| 280 | local dirs |
289 | local dirs |