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

Diff of /eclass/multilib.eclass

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

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

Legend:
Removed from v.1.14  
changed lines
  Added in v.1.50

  ViewVC Help
Powered by ViewVC 1.1.20