/[gentoo-x86]/eclass/multilib.eclass
Gentoo

Diff of /eclass/multilib.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.1.1.1 Revision 1.17
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.1.1.1 2005/11/30 09:59:17 chriswhite Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.17 2005/02/03 05:29:07 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.
9
10ECLASS=multilib
11INHERITED="$INHERITED $ECLASS"
9 12
10DESCRIPTION="Based on the ${ECLASS} eclass" 13DESCRIPTION="Based on the ${ECLASS} eclass"
11 14
12# has_multilib_profile: 15# has_multilib_profile:
13# Return true if the current profile is a multilib profile and lists more than 16# Return true if the current profile is a multilib profile and lists more than
81# 84#
82# Example: 85# Example:
83# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64 86# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
84# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64 87# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
85 88
86# get_libname [version]
87# returns libname with proper suffix {.so,.dylib} and optionally supplied version
88# for ELF/MACH-O shared objects
89#
90# Example:
91# get_libname libfoo ${PV}
92# Returns: libfoo.so.${PV} (ELF) || libfoo.${PV}.dylib (MACH)
93
94### END DOCUMENTATION ### 89### END DOCUMENTATION ###
95
96# Defaults:
97export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"}
98export DEFAULT_ABI=${DEFAULT_ABI:-"default"}
99export CFLAGS_default
100export LDFLAGS_default
101export CHOST_default=${CHOST_default:-${CHOST}}
102export CTARGET_default=${CTARGET_default:-${CTARGET:-${CHOST_default}}}
103export LIBDIR_default=${CONF_LIBDIR:-"lib"}
104export CDEFINE_default="__unix__"
105 90
106# has_multilib_profile() 91# has_multilib_profile()
107has_multilib_profile() { 92has_multilib_profile() {
108 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ] 93 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ]
109} 94}
120# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set, 105# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set,
121# fall back on old behavior. Any profile that has these set should also 106# fall back on old behavior. Any profile that has these set should also
122# depend on a newer version of portage (not yet released) which uses these 107# depend on a newer version of portage (not yet released) which uses these
123# over CONF_LIBDIR in econf, dolib, etc... 108# over CONF_LIBDIR in econf, dolib, etc...
124get_libdir() { 109get_libdir() {
125 local CONF_LIBDIR 110 LIBDIR_TEST=$(type econf)
126 if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then 111 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
127 # if there is an override, we want to use that... always. 112 # if there is an override, we want to use that... always.
128 echo ${CONF_LIBDIR_OVERRIDE} 113 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
129 else 114 elif [ -n "$(get_abi_LIBDIR)" ]; then
130 get_abi_LIBDIR 115 CONF_LIBDIR="$(get_abi_LIBDIR)"
116 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
117 # will be <portage-2.0.51_pre20
118 CONF_LIBDIR="lib"
131 fi 119 fi
120 # and of course, default to lib if CONF_LIBDIR isnt set
121 echo ${CONF_LIBDIR:=lib}
122 unset LIBDIR_TEST
132} 123}
133 124
134get_multilibdir() { 125get_multilibdir() {
135 if has_multilib_profile; then 126 if [ -n "$(get_abi_LIBDIR)" ]; then
136 eerror "get_multilibdir called, but it shouldn't be needed with the new multilib approach. Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org" 127 eerror "get_multilibdir called, but it shouldn't be needed with the new multilib approach. Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org"
137 exit 1 128 exit 1
138 fi 129 fi
139 echo ${CONF_MULTILIBDIR:=lib32} 130 echo ${CONF_MULTILIBDIR:=lib32}
140} 131}
149# 140#
150# get_libdir_override lib64 141# get_libdir_override lib64
151# 142#
152# Travis Tilley <lv@gentoo.org> (31 Aug 2004) 143# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
153get_libdir_override() { 144get_libdir_override() {
154 if has_multilib_profile; then 145 if [ -n "$(get_abi_LIBDIR)" ]; then
155 eerror "get_libdir_override called, but it shouldn't be needed with the new multilib approach. Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org" 146 eerror "get_libdir_override called, but it shouldn't be needed with the new multilib approach. Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org"
156 exit 1 147 exit 1
157 fi 148 fi
158 CONF_LIBDIR="$1" 149 CONF_LIBDIR="$1"
159 CONF_LIBDIR_OVERRIDE="$1" 150 CONF_LIBDIR_OVERRIDE="$1"
160 LIBDIR_default="$1"
161} 151}
162 152
163# get_abi_var <VAR> [<ABI>] 153# get_abi_var <VAR> [<ABI>]
164# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults 154# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
165# 155#
173# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used. 163# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
174# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string. 164# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
175# 165#
176# Jeremy Huddleston <eradicator@gentoo.org> 166# Jeremy Huddleston <eradicator@gentoo.org>
177get_abi_var() { 167get_abi_var() {
178 local flag=$1 168 local flag=${1}
179 local abi 169 local abi
180 if [ $# -gt 1 ]; then 170 if [ $# -gt 1 ]; then
181 abi=${2} 171 abi=${2}
182 elif [ -n "${ABI}" ]; then 172 elif [ -n "${ABI}" ]; then
183 abi=${ABI} 173 abi=${ABI}
184 elif [ -n "${DEFAULT_ABI}" ]; then 174 elif [ -n "${DEFAULT_ABI}" ]; then
185 abi=${DEFAULT_ABI} 175 abi=${DEFAULT_ABI}
186 else 176 else
187 abi="default" 177 return 1
188 fi 178 fi
189 179
190 local var="${flag}_${abi}" 180 local var="${flag}_${abi}"
191 echo ${!var} 181 echo ${!var}
192} 182}
193 183
194get_abi_CFLAGS() { get_abi_var CFLAGS "$@"; } 184get_abi_CFLAGS() { get_abi_var CFLAGS ${@}; }
195get_abi_LDFLAGS() { get_abi_var LDFLAGS "$@"; }
196get_abi_CHOST() { get_abi_var CHOST "$@"; }
197get_abi_CTARGET() { get_abi_var CTARGET "$@"; }
198get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "$@"; }
199get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; } 185get_abi_CDEFINE() { get_abi_var CDEFINE ${@}; }
200get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; } 186get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; }
201 187
202# Return a list of the ABIs we want to install for with 188# Return a list of the ABIs we want to install for with
203# the last one in the list being the default. 189# the last one in the list being the default.
190get_abi_order() {
191 ewarn "Please update your ebuild to use get_install_abis instead of get_abi_order"
192 get_install_abis ${@}
193}
194
204get_install_abis() { 195get_install_abis() {
205 local order="" 196 local order=""
206 197
207 if [[ -z ${MULTILIB_ABIS} ]] ; then 198 if [ -z "${MULTILIB_ABIS}" ]; then
208 echo "default" 199 echo "NOMULTILIB"
209 return 0 200 return 1
210 fi 201 fi
211 202
212 if hasq multilib-pkg-force ${RESTRICT} || 203 if hasq multilib-pkg-force ${RESTRICT} ||
213 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then 204 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
214 for x in ${MULTILIB_ABIS} ; do 205 for x in ${MULTILIB_ABIS}; do
215 if [[ ${x} != "${DEFAULT_ABI}" ]] ; then 206 if [ "${x}" != "${DEFAULT_ABI}" ]; then
216 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}" 207 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}"
217 fi 208 fi
218 done 209 done
219 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}" 210 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}"
220 211
221 if [[ -n ${ABI_ALLOW} ]] ; then 212 if [ -n "${ABI_ALLOW}" ]; then
222 local ordera="" 213 local ordera=""
223 for x in ${order} ; do 214 for x in ${order}; do
224 if hasq ${x} ${ABI_ALLOW} ; then 215 if hasq ${x} ${ABI_ALLOW}; then
225 ordera="${ordera} ${x}" 216 ordera="${ordera} ${x}"
226 fi 217 fi
227 done 218 done
228 order=${ordera} 219 order="${ordera}"
229 fi 220 fi
230 else 221 else
231 order=${DEFAULT_ABI} 222 order="${DEFAULT_ABI}"
232 fi 223 fi
233 224
234 if [[ -z ${order} ]] ; then 225 if [ -z "${order}" ]; then
235 die "The ABI list is empty. Are you using a proper multilib profile? Perhaps your USE flags or MULTILIB_ABIS are too restrictive for this package." 226 die "The ABI list is empty. Are you using a proper multilib profile? Perhaps your USE flags or MULTILIB_ABIS are too restrictive for this package."
236 fi 227 fi
237 228
238 echo ${order} 229 echo ${order}
239 return 0 230 return 0
242# Return a list of the ABIs supported by this profile. 233# Return a list of the ABIs supported by this profile.
243# the last one in the list being the default. 234# the last one in the list being the default.
244get_all_abis() { 235get_all_abis() {
245 local order="" 236 local order=""
246 237
247 if [[ -z ${MULTILIB_ABIS} ]] ; then 238 if [ -z "${MULTILIB_ABIS}" ]; then
248 echo "default" 239 echo "NOMULTILIB"
249 return 0 240 return 1
250 fi 241 fi
251 242
252 for x in ${MULTILIB_ABIS}; do 243 for x in ${MULTILIB_ABIS}; do
253 if [[ ${x} != ${DEFAULT_ABI} ]] ; then 244 if [ "${x}" != "${DEFAULT_ABI}" ]; then
254 order="${order:+${order} }${x}" 245 order="${order:+${order }}${x}"
255 fi 246 fi
256 done 247 done
257 order="${order:+${order} }${DEFAULT_ABI}" 248 order="${order:+${order} }${DEFAULT_ABI}"
258 249
259 echo ${order} 250 echo ${order}
271 if has_multilib_profile; then 262 if has_multilib_profile; then
272 for abi in ${MULTILIB_ABIS}; do 263 for abi in ${MULTILIB_ABIS}; do
273 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" 264 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
274 done 265 done
275 elif [ -n "${CONF_LIBDIR}" ]; then 266 elif [ -n "${CONF_LIBDIR}" ]; then
276 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:-lib32}; do 267 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:=lib32}; do
277 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}" 268 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}"
278 done 269 done
279 fi 270 fi
280 271
281 echo "${libdirs}" 272 echo "${libdirs}"
283 274
284# Return true if ${ABI} is the last ABI on our list (or if we're not 275# Return true if ${ABI} is the last ABI on our list (or if we're not
285# using the new multilib configuration. This can be used to determine 276# using the new multilib configuration. This can be used to determine
286# if we're in the last (or only) run through src_{unpack,compile,install} 277# if we're in the last (or only) run through src_{unpack,compile,install}
287is_final_abi() { 278is_final_abi() {
288 has_multilib_profile || return 0 279 ! has_multilib_profile && return 0
289 local ALL_ABIS=$(get_install_abis) 280 local ALL_ABIS=$(get_abi_order)
290 local LAST_ABI=${ALL_ABIS/* /} 281 local LAST_ABI=${ALL_ABIS/* /}
291 [[ ${LAST_ABI} == ${ABI} ]] 282 [ "${LAST_ABI}" = "${ABI}" ]
292} 283}
293 284
294# echo the number of ABIs we will be installing for 285# echo the number of ABIs we will be installing for
295number_abis() { 286number_abis() {
296 get_install_abis | wc -w 287 get_abi_order | wc -w
297} 288}
298 289
299# get_ml_incdir [<include dir> [<ABI>]] 290# get_ml_incdir [<include dir> [<ABI>]]
300# include dir defaults to /usr/include 291# include dir defaults to /usr/include
301# ABI defaults to ${ABI} or ${DEFAULT_ABI} 292# ABI defaults to ${ABI} or ${DEFAULT_ABI}
302get_ml_incdir() { 293get_ml_incdir() {
303 local dir=/usr/include 294 local dir=/usr/include
304 295
305 if [[ $# -gt 0 ]]; then 296 if [[ ${#} -gt 0 ]]; then
306 incdir=$1 297 incdir=${1}
307 shift 298 shift
308 fi 299 fi
309 300
310 if [[ -z "${MULTILIB_ABIS}" ]]; then 301 if [[ -z "${MULTILIB_ABIS}" ]]; then
311 echo ${incdir} 302 echo ${incdir}
312 return 0 303 return 0
313 fi 304 fi
314 305
315 local abi=${ABI-${DEFAULT_ABI}} 306 local abi=${ABI:-${DEFAULT_ABI}}
316 if [[ $# -gt 0 ]]; then 307 if [[ ${#} -gt 0 ]]; then
317 abi=$1 308 abi=${1}
318 shift 309 shift
319 fi 310 fi
320 311
321 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then 312 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then
322 echo ${dir}/gentoo-multilib/${abi} 313 echo ${dir}/gentoo-multilib/${abi}
339# ... 330# ...
340# prep_ml_includes /usr/qt/3/include 331# prep_ml_includes /usr/qt/3/include
341# } 332# }
342 333
343prep_ml_includes() { 334prep_ml_includes() {
344 if [[ $(number_abis) -gt 1 ]] ; then 335 if [ $(number_abis) -gt 1 ]; then
345 local dir 336 local dir
346 local dirs 337 local dirs
347 local base 338 local base
348 339
349 if [[ $# -eq 0 ]] ; then 340 if [ ${#} -eq 0 ]; then
350 dirs=/usr/include 341 dirs="/usr/include"
351 else 342 else
352 dirs="$@" 343 dirs="${@}"
353 fi 344 fi
354 345
355 for dir in ${dirs} ; do 346 for dir in ${dirs}; do
356 base=${T}/gentoo-multilib/${dir}/gentoo-multilib 347 base=${T}/gentoo-multilib/${dir}/gentoo-multilib
357 mkdir -p "${base}" 348 mkdir -p ${base}
358 [[ -d ${base}/${ABI} ]] && rm -rf "${base}/${ABI}" 349 [ -d ${base}/${ABI} ] && rm -rf ${base}/${ABI}
359 mv "${D}/${dir}" "${base}/${ABI}" 350 mv ${D}/${dir} ${base}/${ABI}
360 done 351 done
361 352
362 if is_final_abi; then 353 if is_final_abi; then
363 base=${T}/gentoo-multilib 354 base=${T}/gentoo-multilib
364 pushd "${base}" 355 pushd ${base}
365 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D} 356 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D}
366 popd 357 popd
367 358
368 # This 'set' stuff is required by mips profiles to properly pass
369 # CDEFINE's (which have spaces) to sub-functions
370 set --
371 for dir in ${dirs} ; do 359 for dir in ${dirs}; do
372 set -- "$@" "${dir}" 360 local args=${dir}
373 local abi 361 local abi
374 for abi in $(get_install_abis); do 362 for abi in $(get_abi_order); do
375 set -- "$@" "$(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}" 363 args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
376 done 364 done
377 create_ml_includes "$@" 365 create_ml_includes ${args}
378 done 366 done
379 fi 367 fi
380 fi 368 fi
381} 369}
382 370
389# 377#
390# Example: 378# Example:
391# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64 379# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
392# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64 380# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
393create_ml_includes() { 381create_ml_includes() {
394 local dest=$1 382 local dest="${1}"
395 shift 383 shift
384 local mlinfo="${@}"
396 local basedirs=$(create_ml_includes-listdirs "$@") 385 local basedirs=$(create_ml_includes-listdirs ${mlinfo})
397 386
398 create_ml_includes-makedestdirs ${dest} ${basedirs} 387 create_ml_includes-makedestdirs ${dest} ${basedirs}
399 388
400 local file 389 local file
401 for file in $(create_ml_includes-allfiles ${basedirs}) ; do 390 for file in $(create_ml_includes-allfiles ${basedirs}); do
402 #local name=$(echo ${file} | tr '[:lower:]' '[:upper:]' | sed 's:[^[:upper:]]:_:g') 391 local name="$(echo $file | tr a-z A-Z | sed 's:[^A-Z]:_:g')"
403 ( 392 {
404 echo "/* Autogenerated by create_ml_includes() in multilib.eclass */" 393 echo "/* Common header file autogenerated by create_ml_includes in multilib.eclass */"
394 #echo "#ifndef __CREATE_ML_INCLUDES_STUB_${name}__"
395 #echo "#define __CREATE_ML_INCLUDES_STUB_${name}__"
396 #echo ""
405 397
406 local dir 398 local dir
407 for dir in ${basedirs}; do 399 for dir in ${basedirs}; do
408 if [[ -f ${D}/${dir}/${file} ]] ; then 400 if [ -f "${D}/${dir}/${file}" ]; then
401 echo "#ifdef $(create_ml_includes-sym_for_dir ${dir} ${mlinfo})"
402 echo "#include \"$(create_ml_includes-relative_between ${dest}/$(dirname ${file}) ${dir}/${file})\""
403 echo "#endif /* $(create_ml_includes-sym_for_dir ${dir} ${mlinfo}) */"
409 echo "" 404 echo ""
410 local sym=$(create_ml_includes-sym_for_dir ${dir} "$@")
411 if [[ ${sym/=} != "${sym}" ]] ; then
412 echo "#if ${sym}"
413 elif [[ ${sym::1} == "!" ]] ; then
414 echo "#ifndef ${sym:1}"
415 else
416 echo "#ifdef ${sym}"
417 fi
418 echo "# include <$(create_ml_includes-absolute ${dir}/${file})>"
419 echo "#endif /* ${sym} */"
420 fi 405 fi
421 done 406 done
422 407
423 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" 408 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
424 ) > "${D}/${dest}/${file}" 409 } > ${D}/${dest}/${file}
425 done 410 done
426} 411}
427 412
428# Helper function for create_ml_includes 413# Helper function for create_ml_includes
429create_ml_includes-absolute() { 414create_ml_includes-relative_between() {
415 local src="$(create_ml_includes-tidy_path ${1})"
430 local dst="$(create_ml_includes-tidy_path $1)" 416 local dst="$(create_ml_includes-tidy_path ${2})"
431 417
418 src=(${src//\// })
432 dst=(${dst//\// }) 419 dst=(${dst//\// })
433 420
434 local i 421 local i
435 for ((i=0; i<${#dst[*]}; i++)); do 422 for ((i=0; i<${#src[*]}; i++)); do
436 [ "${dst[i]}" == "include" ] && break 423 [ "${dst[i]}" != "${src[i]}" ] && break
437 done 424 done
438 425
439 local strip_upto=$i 426 local common=$i
440 427
428 for ((i=${#src[*]}; i>common; i--)); do
429 echo -n ../
430 done
431
441 for ((i=strip_upto+1; i<${#dst[*]}-1; i++)); do 432 for ((i=common; i<${#dst[*]}-1; i++)); do
442 echo -n ${dst[i]}/ 433 echo -n ${dst[i]}/
443 done 434 done
444 435
445 echo -n ${dst[i]} 436 echo -n ${dst[i]}
446} 437}
447 438
448# Helper function for create_ml_includes 439# Helper function for create_ml_includes
449create_ml_includes-tidy_path() { 440create_ml_includes-tidy_path() {
450 local removed=$1 441 local removed="${1}"
451 442
452 if [ -n "${removed}" ]; then 443 if [ -n "${removed}" ]; then
453 # Remove multiple slashes 444 # Remove multiple slashes
454 while [ "${removed}" != "${removed/\/\//\/}" ]; do 445 while [ "${removed}" != "${removed/\/\//\/}" ]; do
455 removed=${removed/\/\//\/} 446 removed=${removed/\/\//\/}
472 # Remove trailing .. 463 # Remove trailing ..
473 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*} 464 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*}
474 465
475 # Remove trailing / 466 # Remove trailing /
476 [ "${removed##*/}" = "" ] && removed=${removed%/*} 467 [ "${removed##*/}" = "" ] && removed=${removed%/*}
477 468
478 echo ${removed} 469 echo ${removed}
479 fi 470 fi
480} 471}
481 472
482# Helper function for create_ml_includes 473# Helper function for create_ml_includes
483create_ml_includes-listdirs() { 474create_ml_includes-listdirs() {
484 local dirs 475 local dirs
485 local data 476 local data
486 for data in "$@"; do 477 for data in ${@}; do
487 dirs="${dirs} ${data/*:/}" 478 dirs="${dirs} ${data/*:/}"
488 done 479 done
489 echo ${dirs:1} 480 echo ${dirs:1}
490} 481}
491 482
492# Helper function for create_ml_includes 483# Helper function for create_ml_includes
493create_ml_includes-makedestdirs() { 484create_ml_includes-makedestdirs() {
494 local dest=$1 485 local dest=${1}
495 shift 486 shift
496 local basedirs=$@ 487 local basedirs=${@}
497 488
498 dodir ${dest} 489 dodir ${dest}
499 490
500 local basedir 491 local basedir
501 for basedir in ${basedirs}; do 492 for basedir in ${basedirs}; do
506 done 497 done
507} 498}
508 499
509# Helper function for create_ml_includes 500# Helper function for create_ml_includes
510create_ml_includes-allfiles() { 501create_ml_includes-allfiles() {
502 local basedirs=${@}
503
511 local basedir file 504 local basedir
512 for basedir in "$@" ; do 505 for basedir in ${basedirs}; do
506 local file
513 for file in $(find "${D}"/${basedir} -type f); do 507 for file in $(find ${D}/${basedir} -type f); do
514 echo ${file/${D}\/${basedir}\//} 508 echo ${file/${D}\/${basedir}\//}
515 done 509 done
516 done | sort | uniq 510 done | sort | uniq
517} 511}
518 512
519# Helper function for create_ml_includes 513# Helper function for create_ml_includes
520create_ml_includes-sym_for_dir() { 514create_ml_includes-sym_for_dir() {
521 local dir=$1 515 local dir="${1}"
522 shift 516 shift
523 local data 517 local data
524 for data in "$@"; do 518 for data in ${@}; do
525 if [[ ${data} == *:${dir} ]] ; then 519 if [ "${dir}" = "${data/*:/}" ]; then
526 echo ${data/:*/} 520 echo ${data/:*/}
527 return 0 521 return 0
528 fi 522 fi
529 done 523 done
530 echo "Shouldn't be here -- create_ml_includes-sym_for_dir $1 $@" 524 echo "Shouldn't be here -- create_ml_includes-sym_for_dir ${1} ${@}"
531 # exit because we'll likely be called from a subshell 525 # exit because we'll likely be called from a subshell
532 exit 1 526 exit 1
533} 527}
534
535get_libname() {
536 local libname
537 local ver=$1
538 case ${CHOST} in
539 *-darwin*) libname="dylib";;
540 *) libname="so";;
541 esac
542
543 if [[ -z $@ ]] ; then
544 echo ".${libname}"
545 else
546 for ver in "$@" ; do
547 case ${CHOST} in
548 *-darwin*) echo ".${ver}.${libname}";;
549 *) echo ".${libname}.${ver}";;
550 esac
551 done
552 fi
553}
554
555# This is for the toolchain to setup profile variables when pulling in
556# a crosscompiler (and thus they aren't set in the profile)
557multilib_env() {
558 local CTARGET=${1:-${CTARGET}}
559
560 case ${CTARGET} in
561 x86_64*)
562 export CFLAGS_x86=${CFLAGS_x86--m32}
563 export CHOST_x86=${CTARGET/x86_64/i686}
564 export CTARGET_x86=${CHOST_x86}
565 export CDEFINE_x86="__i386__"
566 export LIBDIR_x86="lib"
567
568 export CFLAGS_amd64=${CFLAGS_amd64--m64}
569 export CHOST_amd64=${CTARGET}
570 export CTARGET_amd64=${CTARGET_amd64}
571 export CDEFINE_amd64="__x86_64__"
572 export LIBDIR_amd64="lib64"
573
574 export MULTILIB_ABIS="amd64 x86"
575 export DEFAULT_ABI="amd64"
576 ;;
577 mips64*)
578 export CFLAGS_o32=${CFLAGS_o32--mabi=32}
579 export CHOST_o32=${CTARGET/mips64/mips}
580 export CTARGET_o32=${CHOST_o32}
581 export CDEFINE_o32="_MIPS_SIM == _ABIO32"
582 export LIBDIR_o32="lib"
583
584 export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
585 export CHOST_n32=${CTARGET}
586 export CTARGET_n32=${CHOST_n32}
587 export CDEFINE_n32="_MIPS_SIM == _ABIN32"
588 export LIBDIR_n32="lib32"
589
590 export CFLAGS_n64=${CFLAGS_n64--mabi=64}
591 export CHOST_n64=${CTARGET}
592 export CTARGET_n64=${CHOST_n64}
593 export CDEFINE_n64="_MIPS_SIM == _ABI64"
594 export LIBDIR_n64="lib64"
595
596 export MULTILIB_ABIS="n64 n32 o32"
597 export DEFAULT_ABI="n32"
598 ;;
599 powerpc64*)
600 export CFLAGS_ppc=${CFLAGS_ppc--m32}
601 export CHOST_ppc=${CTARGET/powerpc64/powerpc}
602 export CTARGET_ppc=${CHOST_ppc}
603 export CDEFINE_ppc="!__powerpc64__"
604 export LIBDIR_ppc="lib"
605
606 export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
607 export CHOST_ppc64=${CTARGET}
608 export CTARGET_ppc64=${CHOST_ppc64}
609 export CDEFINE_ppc64="__powerpc64__"
610 export LIBDIR_ppc64="lib64"
611
612 export MULTILIB_ABIS="ppc64 ppc"
613 export DEFAULT_ABI="ppc64"
614 ;;
615 s390x*)
616 export CFLAGS_s390=${CFLAGS_s390--m31} # the 31 is not a typo
617 export CHOST_s390=${CTARGET/s390x/s390}
618 export CTARGET_s390=${CHOST_s390}
619 export CDEFINE_s390="!__s390x__"
620 export LIBDIR_s390="lib"
621
622 export CFLAGS_s390x=${CFLAGS_s390x--m64}
623 export CHOST_s390x=${CTARGET}
624 export CTARGET_s390x=${CHOST_s390x}
625 export CDEFINE_s390x="__s390x__"
626 export LIBDIR_s390x="lib64"
627
628 export MULTILIB_ABIS="s390x s390"
629 export DEFAULT_ABI="s390x"
630 ;;
631 sparc64*)
632 export CFLAGS_sparc32=${CFLAGS_sparc32--m32}
633 export CHOST_sparc32=${CTARGET/sparc64/sparc}
634 export CTARGET_sparc32=${CHOST_sparc32}
635 export CDEFINE_sparc32="!__arch64__"
636 export LIBDIR_sparc32="lib"
637
638 export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
639 export CHOST_sparc64=${CTARGET}
640 export CTARGET_sparc64=${CHOST_sparc64}
641 export CDEFINE_sparc64="__arch64__"
642 export LIBDIR_sparc64="lib64"
643
644 export MULTILIB_ABIS="sparc64 sparc32"
645 export DEFAULT_ABI="sparc64"
646 ;;
647 *)
648 export MULTILIB_ABIS="default"
649 export DEFAULT_ABI="default"
650 ;;
651 esac
652}

Legend:
Removed from v.1.1.1.1  
changed lines
  Added in v.1.17

  ViewVC Help
Powered by ViewVC 1.1.20