/[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.15
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.15 2005/01/27 22:07:36 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
20# on our last run through a src_* function. 23# on our last run through a src_* function.
21 24
22# number_abis: 25# number_abis:
23# echo the number of ABIs we will be installing for 26# echo the number of ABIs we will be installing for
24 27
25# get_install_abis: 28# get_abi_order:
26# Return a list of the ABIs we want to install for with 29# Return a list of the ABIs we want to install for with
27# the last one in the list being the default. 30# the last one in the list being the default.
28 31
29# get_all_abis:
30# Return a list of the ABIs supported by this profile.
31# the last one in the list being the default.
32
33# get_all_libdirs: 32# get_all_libdir:
34# Returns a list of all the libdirs used by this profile. This includes 33# Returns a list of all the libdirs used by this profile. This includes
35# those that might not be touched by the current ebuild and always includes 34# those that might not be touched by the current ebuild and always includes
36# "lib". 35# "lib".
37 36
38# get_libdir: 37# get_libdir:
81# 80#
82# Example: 81# Example:
83# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64 82# 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 83# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
85 84
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 ### 85### 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 86
106# has_multilib_profile() 87# has_multilib_profile()
107has_multilib_profile() { 88has_multilib_profile() {
108 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ] 89 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ]
109} 90}
120# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set, 101# 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 102# 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 103# depend on a newer version of portage (not yet released) which uses these
123# over CONF_LIBDIR in econf, dolib, etc... 104# over CONF_LIBDIR in econf, dolib, etc...
124get_libdir() { 105get_libdir() {
125 local CONF_LIBDIR 106 LIBDIR_TEST=$(type econf)
126 if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then 107 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
127 # if there is an override, we want to use that... always. 108 # if there is an override, we want to use that... always.
128 echo ${CONF_LIBDIR_OVERRIDE} 109 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
129 else 110 elif [ -n "$(get_abi_LIBDIR)" ]; then
130 get_abi_LIBDIR 111 CONF_LIBDIR="$(get_abi_LIBDIR)"
112 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
113 # will be <portage-2.0.51_pre20
114 CONF_LIBDIR="lib"
131 fi 115 fi
116 # and of course, default to lib if CONF_LIBDIR isnt set
117 echo ${CONF_LIBDIR:=lib}
118 unset LIBDIR_TEST
132} 119}
133 120
134get_multilibdir() { 121get_multilibdir() {
135 if has_multilib_profile; then 122 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" 123 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 124 exit 1
138 fi 125 fi
139 echo ${CONF_MULTILIBDIR:=lib32} 126 echo ${CONF_MULTILIBDIR:=lib32}
140} 127}
149# 136#
150# get_libdir_override lib64 137# get_libdir_override lib64
151# 138#
152# Travis Tilley <lv@gentoo.org> (31 Aug 2004) 139# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
153get_libdir_override() { 140get_libdir_override() {
154 if has_multilib_profile; then 141 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" 142 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 143 exit 1
157 fi 144 fi
158 CONF_LIBDIR="$1" 145 CONF_LIBDIR="$1"
159 CONF_LIBDIR_OVERRIDE="$1" 146 CONF_LIBDIR_OVERRIDE="$1"
160 LIBDIR_default="$1"
161} 147}
162 148
163# get_abi_var <VAR> [<ABI>] 149# get_abi_var <VAR> [<ABI>]
164# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults 150# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
165# 151#
173# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used. 159# 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. 160# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
175# 161#
176# Jeremy Huddleston <eradicator@gentoo.org> 162# Jeremy Huddleston <eradicator@gentoo.org>
177get_abi_var() { 163get_abi_var() {
178 local flag=$1 164 local flag=${1}
179 local abi 165 local abi
180 if [ $# -gt 1 ]; then 166 if [ $# -gt 1 ]; then
181 abi=${2} 167 abi=${2}
182 elif [ -n "${ABI}" ]; then 168 elif [ -n "${ABI}" ]; then
183 abi=${ABI} 169 abi=${ABI}
184 elif [ -n "${DEFAULT_ABI}" ]; then 170 elif [ -n "${DEFAULT_ABI}" ]; then
185 abi=${DEFAULT_ABI} 171 abi=${DEFAULT_ABI}
186 else 172 else
187 abi="default" 173 return 1
188 fi 174 fi
189 175
190 local var="${flag}_${abi}" 176 local var="${flag}_${abi}"
191 echo ${!var} 177 echo ${!var}
192} 178}
193 179
194get_abi_CFLAGS() { get_abi_var CFLAGS "$@"; } 180get_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 "$@"; } 181get_abi_CDEFINE() { get_abi_var CDEFINE ${@}; }
200get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; } 182get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; }
201 183
202# Return a list of the ABIs we want to install for with 184# Return a list of the ABIs we want to install for with
203# the last one in the list being the default. 185# the last one in the list being the default.
204get_install_abis() { 186get_abi_order() {
205 local order="" 187 local order=""
206 188
207 if [[ -z ${MULTILIB_ABIS} ]] ; then 189 if [ -z "${MULTILIB_ABIS}" ]; then
208 echo "default" 190 echo "NOMULTILIB"
209 return 0 191 return 1
210 fi 192 fi
211 193
212 if hasq multilib-pkg-force ${RESTRICT} || 194 if hasq multilib-pkg-force ${RESTRICT} ||
213 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then 195 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
214 for x in ${MULTILIB_ABIS} ; do 196 for x in ${MULTILIB_ABIS}; do
215 if [[ ${x} != "${DEFAULT_ABI}" ]] ; then 197 if [ "${x}" != "${DEFAULT_ABI}" ]; then
216 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}" 198 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}"
217 fi 199 fi
218 done 200 done
219 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}" 201 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}"
220 202
221 if [[ -n ${ABI_ALLOW} ]] ; then 203 if [ -n "${ABI_ALLOW}" ]; then
222 local ordera="" 204 local ordera=""
223 for x in ${order} ; do 205 for x in ${order}; do
224 if hasq ${x} ${ABI_ALLOW} ; then 206 if hasq ${x} ${ABI_ALLOW}; then
225 ordera="${ordera} ${x}" 207 ordera="${ordera} ${x}"
226 fi 208 fi
227 done 209 done
228 order=${ordera} 210 order="${ordera}"
229 fi 211 fi
230 else 212 else
231 order=${DEFAULT_ABI} 213 order="${DEFAULT_ABI}"
232 fi 214 fi
233 215
234 if [[ -z ${order} ]] ; then 216 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." 217 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 218 fi
237 219
238 echo ${order} 220 echo ${order}
239 return 0 221 return 0
240} 222}
241 223
242# Return a list of the ABIs supported by this profile.
243# the last one in the list being the default.
244get_all_abis() {
245 local order=""
246
247 if [[ -z ${MULTILIB_ABIS} ]] ; then
248 echo "default"
249 return 0
250 fi
251
252 for x in ${MULTILIB_ABIS}; do
253 if [[ ${x} != ${DEFAULT_ABI} ]] ; then
254 order="${order:+${order} }${x}"
255 fi
256 done
257 order="${order:+${order} }${DEFAULT_ABI}"
258
259 echo ${order}
260 return 0
261}
262
263# get_all_libdirs() 224# get_all_libdir()
264# Returns a list of all the libdirs used by this profile. This includes 225# Returns a list of all the libdirs used by this profile. This includes
265# those that might not be touched by the current ebuild. 226# those that might not be touched by the current ebuild.
266get_all_libdirs() { 227get_all_libdirs() {
267 local libdirs="lib" 228 local libdirs="lib"
268 local abi 229 local abi
271 if has_multilib_profile; then 232 if has_multilib_profile; then
272 for abi in ${MULTILIB_ABIS}; do 233 for abi in ${MULTILIB_ABIS}; do
273 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" 234 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
274 done 235 done
275 elif [ -n "${CONF_LIBDIR}" ]; then 236 elif [ -n "${CONF_LIBDIR}" ]; then
276 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:-lib32}; do 237 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:=lib32}; do
277 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}" 238 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}"
278 done 239 done
279 fi 240 fi
280 241
281 echo "${libdirs}" 242 echo "${libdirs}"
283 244
284# Return true if ${ABI} is the last ABI on our list (or if we're not 245# 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 246# 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} 247# if we're in the last (or only) run through src_{unpack,compile,install}
287is_final_abi() { 248is_final_abi() {
288 has_multilib_profile || return 0 249 ! has_multilib_profile && return 0
289 local ALL_ABIS=$(get_install_abis) 250 local ALL_ABIS=$(get_abi_order)
290 local LAST_ABI=${ALL_ABIS/* /} 251 local LAST_ABI=${ALL_ABIS/* /}
291 [[ ${LAST_ABI} == ${ABI} ]] 252 [ "${LAST_ABI}" = "${ABI}" ]
292} 253}
293 254
294# echo the number of ABIs we will be installing for 255# echo the number of ABIs we will be installing for
295number_abis() { 256number_abis() {
296 get_install_abis | wc -w 257 get_abi_order | wc -w
297} 258}
298 259
299# get_ml_incdir [<include dir> [<ABI>]] 260# get_ml_incdir [<include dir> [<ABI>]]
300# include dir defaults to /usr/include 261# include dir defaults to /usr/include
301# ABI defaults to ${ABI} or ${DEFAULT_ABI} 262# ABI defaults to ${ABI} or ${DEFAULT_ABI}
302get_ml_incdir() { 263get_ml_incdir() {
303 local dir=/usr/include 264 local dir=/usr/include
304 265
305 if [[ $# -gt 0 ]]; then 266 if [[ ${#} -gt 0 ]]; then
306 incdir=$1 267 incdir=${1}
307 shift 268 shift
308 fi 269 fi
309 270
310 if [[ -z "${MULTILIB_ABIS}" ]]; then 271 if [[ -z "${MULTILIB_ABIS}" ]]; then
311 echo ${incdir} 272 echo ${incdir}
312 return 0 273 return 0
313 fi 274 fi
314 275
315 local abi=${ABI-${DEFAULT_ABI}} 276 local abi=${ABI:-${DEFAULT_ABI}}
316 if [[ $# -gt 0 ]]; then 277 if [[ ${#} -gt 0 ]]; then
317 abi=$1 278 abi=${1}
318 shift 279 shift
319 fi 280 fi
320 281
321 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then 282 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then
322 echo ${dir}/gentoo-multilib/${abi} 283 echo ${dir}/gentoo-multilib/${abi}
339# ... 300# ...
340# prep_ml_includes /usr/qt/3/include 301# prep_ml_includes /usr/qt/3/include
341# } 302# }
342 303
343prep_ml_includes() { 304prep_ml_includes() {
344 if [[ $(number_abis) -gt 1 ]] ; then 305 if [ $(number_abis) -gt 1 ]; then
345 local dir 306 local dir
346 local dirs 307 local dirs
347 local base 308 local base
348 309
349 if [[ $# -eq 0 ]] ; then 310 if [ ${#} -eq 0 ]; then
350 dirs=/usr/include 311 dirs="/usr/include"
351 else 312 else
352 dirs="$@" 313 dirs="${@}"
353 fi 314 fi
354 315
355 for dir in ${dirs} ; do 316 for dir in ${dirs}; do
356 base=${T}/gentoo-multilib/${dir}/gentoo-multilib 317 base=${T}/gentoo-multilib/${dir}/gentoo-multilib
357 mkdir -p "${base}" 318 mkdir -p ${base}
358 [[ -d ${base}/${ABI} ]] && rm -rf "${base}/${ABI}" 319 [ -d ${base}/${ABI} ] && rm -rf ${base}/${ABI}
359 mv "${D}/${dir}" "${base}/${ABI}" 320 mv ${D}/${dir} ${base}/${ABI}
360 done 321 done
361 322
362 if is_final_abi; then 323 if is_final_abi; then
363 base=${T}/gentoo-multilib 324 base=${T}/gentoo-multilib
364 pushd "${base}" 325 pushd ${base}
365 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D} 326 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D}
366 popd 327 popd
367 328
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 329 for dir in ${dirs}; do
372 set -- "$@" "${dir}" 330 local args=${dir}
373 local abi 331 local abi
374 for abi in $(get_install_abis); do 332 for abi in $(get_abi_order); do
375 set -- "$@" "$(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}" 333 args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
376 done 334 done
377 create_ml_includes "$@" 335 create_ml_includes ${args}
378 done 336 done
379 fi 337 fi
380 fi 338 fi
381} 339}
382 340
389# 347#
390# Example: 348# Example:
391# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64 349# 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 350# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
393create_ml_includes() { 351create_ml_includes() {
394 local dest=$1 352 local dest="${1}"
395 shift 353 shift
354 local mlinfo="${@}"
396 local basedirs=$(create_ml_includes-listdirs "$@") 355 local basedirs=$(create_ml_includes-listdirs ${mlinfo})
397 356
398 create_ml_includes-makedestdirs ${dest} ${basedirs} 357 create_ml_includes-makedestdirs ${dest} ${basedirs}
399 358
400 local file 359 local file
401 for file in $(create_ml_includes-allfiles ${basedirs}) ; do 360 for file in $(create_ml_includes-allfiles ${basedirs}); do
402 #local name=$(echo ${file} | tr '[:lower:]' '[:upper:]' | sed 's:[^[:upper:]]:_:g') 361 local name="$(echo $file | tr a-z A-Z | sed 's:[^A-Z]:_:g')"
403 ( 362 {
404 echo "/* Autogenerated by create_ml_includes() in multilib.eclass */" 363 echo "/* Common header file autogenerated by create_ml_includes in multilib.eclass */"
364 #echo "#ifndef __CREATE_ML_INCLUDES_STUB_${name}__"
365 #echo "#define __CREATE_ML_INCLUDES_STUB_${name}__"
366 #echo ""
405 367
406 local dir 368 local dir
407 for dir in ${basedirs}; do 369 for dir in ${basedirs}; do
408 if [[ -f ${D}/${dir}/${file} ]] ; then 370 if [ -f "${D}/${dir}/${file}" ]; then
371 echo "#ifdef $(create_ml_includes-sym_for_dir ${dir} ${mlinfo})"
372 echo "#include \"$(create_ml_includes-relative_between ${dest}/$(dirname ${file}) ${dir}/${file})\""
373 echo "#endif /* $(create_ml_includes-sym_for_dir ${dir} ${mlinfo}) */"
409 echo "" 374 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 375 fi
421 done 376 done
422 377
423 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" 378 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
424 ) > "${D}/${dest}/${file}" 379 } > ${D}/${dest}/${file}
425 done 380 done
426} 381}
427 382
428# Helper function for create_ml_includes 383# Helper function for create_ml_includes
429create_ml_includes-absolute() { 384create_ml_includes-relative_between() {
385 local src="$(create_ml_includes-tidy_path ${1})"
430 local dst="$(create_ml_includes-tidy_path $1)" 386 local dst="$(create_ml_includes-tidy_path ${2})"
431 387
388 src=(${src//\// })
432 dst=(${dst//\// }) 389 dst=(${dst//\// })
433 390
434 local i 391 local i
435 for ((i=0; i<${#dst[*]}; i++)); do 392 for ((i=0; i<${#src[*]}; i++)); do
436 [ "${dst[i]}" == "include" ] && break 393 [ "${dst[i]}" != "${src[i]}" ] && break
437 done 394 done
438 395
439 local strip_upto=$i 396 local common=$i
440 397
398 for ((i=${#src[*]}; i>common; i--)); do
399 echo -n ../
400 done
401
441 for ((i=strip_upto+1; i<${#dst[*]}-1; i++)); do 402 for ((i=common; i<${#dst[*]}-1; i++)); do
442 echo -n ${dst[i]}/ 403 echo -n ${dst[i]}/
443 done 404 done
444 405
445 echo -n ${dst[i]} 406 echo -n ${dst[i]}
446} 407}
447 408
448# Helper function for create_ml_includes 409# Helper function for create_ml_includes
449create_ml_includes-tidy_path() { 410create_ml_includes-tidy_path() {
450 local removed=$1 411 local removed="${1}"
451 412
452 if [ -n "${removed}" ]; then 413 if [ -n "${removed}" ]; then
453 # Remove multiple slashes 414 # Remove multiple slashes
454 while [ "${removed}" != "${removed/\/\//\/}" ]; do 415 while [ "${removed}" != "${removed/\/\//\/}" ]; do
455 removed=${removed/\/\//\/} 416 removed=${removed/\/\//\/}
472 # Remove trailing .. 433 # Remove trailing ..
473 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*} 434 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*}
474 435
475 # Remove trailing / 436 # Remove trailing /
476 [ "${removed##*/}" = "" ] && removed=${removed%/*} 437 [ "${removed##*/}" = "" ] && removed=${removed%/*}
477 438
478 echo ${removed} 439 echo ${removed}
479 fi 440 fi
480} 441}
481 442
482# Helper function for create_ml_includes 443# Helper function for create_ml_includes
483create_ml_includes-listdirs() { 444create_ml_includes-listdirs() {
484 local dirs 445 local dirs
485 local data 446 local data
486 for data in "$@"; do 447 for data in ${@}; do
487 dirs="${dirs} ${data/*:/}" 448 dirs="${dirs} ${data/*:/}"
488 done 449 done
489 echo ${dirs:1} 450 echo ${dirs:1}
490} 451}
491 452
492# Helper function for create_ml_includes 453# Helper function for create_ml_includes
493create_ml_includes-makedestdirs() { 454create_ml_includes-makedestdirs() {
494 local dest=$1 455 local dest=${1}
495 shift 456 shift
496 local basedirs=$@ 457 local basedirs=${@}
497 458
498 dodir ${dest} 459 dodir ${dest}
499 460
500 local basedir 461 local basedir
501 for basedir in ${basedirs}; do 462 for basedir in ${basedirs}; do
506 done 467 done
507} 468}
508 469
509# Helper function for create_ml_includes 470# Helper function for create_ml_includes
510create_ml_includes-allfiles() { 471create_ml_includes-allfiles() {
472 local basedirs=${@}
473
511 local basedir file 474 local basedir
512 for basedir in "$@" ; do 475 for basedir in ${basedirs}; do
476 local file
513 for file in $(find "${D}"/${basedir} -type f); do 477 for file in $(find ${D}/${basedir} -type f); do
514 echo ${file/${D}\/${basedir}\//} 478 echo ${file/${D}\/${basedir}\//}
515 done 479 done
516 done | sort | uniq 480 done | sort | uniq
517} 481}
518 482
519# Helper function for create_ml_includes 483# Helper function for create_ml_includes
520create_ml_includes-sym_for_dir() { 484create_ml_includes-sym_for_dir() {
521 local dir=$1 485 local dir="${1}"
522 shift 486 shift
523 local data 487 local data
524 for data in "$@"; do 488 for data in ${@}; do
525 if [[ ${data} == *:${dir} ]] ; then 489 if [ "${dir}" = "${data/*:/}" ]; then
526 echo ${data/:*/} 490 echo ${data/:*/}
527 return 0 491 return 0
528 fi 492 fi
529 done 493 done
530 echo "Shouldn't be here -- create_ml_includes-sym_for_dir $1 $@" 494 echo "Shouldn't be here -- create_ml_includes-sym_for_dir ${1} ${@}"
531 # exit because we'll likely be called from a subshell 495 # exit because we'll likely be called from a subshell
532 exit 1 496 exit 1
533} 497}
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.15

  ViewVC Help
Powered by ViewVC 1.1.20