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

Diff of /eclass/multilib.eclass

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

Revision 1.5 Revision 1.39
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.5 2005/01/12 22:39:44 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.39 2005/10/07 03:39:15 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
15DEPEND="!build? ( sys-apps/sed sys-apps/findutils sys-apps/coreutils )" 12# has_multilib_profile:
13# Return true if the current profile is a multilib profile and lists more than
14# one abi in ${MULTILIB_ABIS}. You might want to use this like
15# 'use multilib || has_multilib_profile' until all profiles utilizing the
16# 'multilib' use flag are removed from portage
17
18# is_final_abi:
19# Return true if ${ABI} is the final abi to be installed (and thus we are
20# on our last run through a src_* function.
21
22# number_abis:
23# echo the number of ABIs we will be installing for
24
25# get_install_abis:
26# Return a list of the ABIs we want to install for with
27# the last one in the list being the default.
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
33# get_all_libdirs:
34# 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
36# "lib".
37
38# get_libdir:
39# Returns the libdir for the selected ABI. This is backwards compatible
40# and simply calls get_abi_LIBDIR() on newer profiles. You should use this
41# to determine where to install shared objects (ex: /usr/$(get_libdir))
42
43# get_abi_var <VAR> [<ABI>]:
44# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
45#
46# get_abi_CFLAGS:
47# get_abi_CDEFINE:
48# get_abi_LIBDIR:
49# Aliases for 'get_abi_var CFLAGS', etc.
50
51# get_ml_incdir [<include dir> [<ABI>]]
52# include dir defaults to /usr/include
53# ABI defaults to ${ABI} or ${DEFAULT_ABI}
54#
55# If a multilib include dir is associated with the passed include dir, then
56# we return it, otherwise, we just echo back the include dir. This is
57# neccessary when a built script greps header files rather than testing them
58# via #include (like perl) to figure out features.
59
60# prep_ml_includes:
61# Some includes (include/asm, glibc, etc) are ABI dependent. In this case,
62# We can install them in different locations for each ABI and create a common
63# header which includes the right one based on CDEFINE_${ABI}. If your
64# package installs ABI-specific headers, just add 'prep_ml_includes' to the
65# end of your src_install(). It takes a list of directories that include
66# files are installed in (default is /usr/include if none are passed).
67#
68# Example:
69# src_install() {
70# ...
71# prep_ml_includes /usr/qt/3/include
72# }
73
74# create_ml_includes <include dir> <symbol 1>:<dir 1> [<symbol 2>:<dir 2> ...]
75# If you need more control than prep_ml_includes can offer (like linux-headers
76# for the asm-* dirs, then use create_ml_includes. The firs argument is the
77# common dir. The remaining args are of the form <symbol>:<dir> where
78# <symbol> is what is put in the #ifdef for choosing that dir.
79#
80# Ideas for this code came from debian's sparc-linux headers package.
81#
82# Example:
83# 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
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
94### 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
106# has_multilib_profile()
107has_multilib_profile() {
108 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ]
109}
16 110
17# This function simply returns the desired lib directory. With portage 111# This function simply returns the desired lib directory. With portage
18# 2.0.51, we now have support for installing libraries to lib32/lib64 112# 2.0.51, we now have support for installing libraries to lib32/lib64
19# to accomidate the needs of multilib systems. It's no longer a good idea 113# to accomidate the needs of multilib systems. It's no longer a good idea
20# to assume all libraries will end up in lib. Replace any (sane) instances 114# to assume all libraries will end up in lib. Replace any (sane) instances
26# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set, 120# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set,
27# fall back on old behavior. Any profile that has these set should also 121# fall back on old behavior. Any profile that has these set should also
28# depend on a newer version of portage (not yet released) which uses these 122# depend on a newer version of portage (not yet released) which uses these
29# over CONF_LIBDIR in econf, dolib, etc... 123# over CONF_LIBDIR in econf, dolib, etc...
30get_libdir() { 124get_libdir() {
31 LIBDIR_TEST=$(type econf) 125 local CONF_LIBDIR
32 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 126 if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then
33 # if there is an override, we want to use that... always. 127 # if there is an override, we want to use that... always.
34 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 128 echo ${CONF_LIBDIR_OVERRIDE}
35 elif [ -n "$(get_abi_LIBDIR)" ]; then 129 else
36 CONF_LIBDIR="$(get_abi_LIBDIR)" 130 get_abi_LIBDIR
37 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
38 # will be <portage-2.0.51_pre20
39 CONF_LIBDIR="lib"
40 fi 131 fi
41 # and of course, default to lib if CONF_LIBDIR isnt set
42 echo ${CONF_LIBDIR:=lib}
43 unset LIBDIR_TEST
44} 132}
45 133
46get_multilibdir() { 134get_multilibdir() {
47 if [ -n "$(get_abi_LIBDIR)" ]; then 135 if has_multilib_profile; then
48 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" 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"
49 exit 1 137 exit 1
50 fi 138 fi
51 echo ${CONF_MULTILIBDIR:=lib32} 139 echo ${CONF_MULTILIBDIR:=lib32}
52} 140}
61# 149#
62# get_libdir_override lib64 150# get_libdir_override lib64
63# 151#
64# Travis Tilley <lv@gentoo.org> (31 Aug 2004) 152# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
65get_libdir_override() { 153get_libdir_override() {
66 if [ -n "$(get_abi_LIBDIR)" ]; then 154 if has_multilib_profile; then
67 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" 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"
68 exit 1 156 exit 1
69 fi 157 fi
70 CONF_LIBDIR="$1" 158 CONF_LIBDIR="$1"
71 CONF_LIBDIR_OVERRIDE="$1" 159 CONF_LIBDIR_OVERRIDE="$1"
160 LIBDIR_default="$1"
72} 161}
73 162
74# get_abi_var <VAR> [<ABI>] 163# get_abi_var <VAR> [<ABI>]
75# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults 164# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
76# 165#
84# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used. 173# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
85# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string. 174# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
86# 175#
87# Jeremy Huddleston <eradicator@gentoo.org> 176# Jeremy Huddleston <eradicator@gentoo.org>
88get_abi_var() { 177get_abi_var() {
89 local flag=${1} 178 local flag=$1
90 local abi 179 local abi
91 if [ $# -gt 1 ]; then 180 if [ $# -gt 1 ]; then
92 abi=${2} 181 abi=${2}
93 elif [ -n "${ABI}" ]; then 182 elif [ -n "${ABI}" ]; then
94 abi=${ABI} 183 abi=${ABI}
95 elif [ -n "${DEFAULT_ABI}" ]; then 184 elif [ -n "${DEFAULT_ABI}" ]; then
96 abi=${DEFAULT_ABI} 185 abi=${DEFAULT_ABI}
97 else 186 else
98 return 1 187 abi="default"
99 fi 188 fi
100 189
101 local var="${flag}_${abi}" 190 local var="${flag}_${abi}"
102 echo ${!var} 191 echo ${!var}
103} 192}
104 193
105get_abi_CFLAGS() { get_abi_var CFLAGS ${@}; } 194get_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 "$@"; }
106get_abi_CDEFINE() { get_abi_var CDEFINE ${@}; } 199get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; }
107get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; } 200get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; }
108 201
109# Return a list of the ABIs we want to install for with 202# Return a list of the ABIs we want to install for with
110# the last one in the list being the default. 203# the last one in the list being the default.
111get_abi_order() { 204get_install_abis() {
112 local order="" 205 local order=""
113 206
114 if [ -z "${MULTILIB_ABIS}" ]; then 207 if [[ -z ${MULTILIB_ABIS} ]] ; then
115 echo "NOMULTILIB" 208 echo "default"
116 return 1 209 return 0
117 fi 210 fi
118 211
119 if hasq multilib-pkg-force ${RESTRICT} || 212 if hasq multilib-pkg-force ${RESTRICT} ||
120 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then 213 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
121 for x in ${MULTILIB_ABIS}; do 214 for x in ${MULTILIB_ABIS} ; do
122 if [ "${x}" != "${DEFAULT_ABI}" ]; then 215 if [[ ${x} != "${DEFAULT_ABI}" ]] ; then
123 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}" 216 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}"
124 fi 217 fi
125 done 218 done
126 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}" 219 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}"
127 220
128 if [ -n "${ABI_ALLOW}" ]; then 221 if [[ -n ${ABI_ALLOW} ]] ; then
129 local ordera="" 222 local ordera=""
130 for x in ${order}; do 223 for x in ${order} ; do
131 if hasq ${x} ${ABI_ALLOW}; then 224 if hasq ${x} ${ABI_ALLOW} ; then
132 ordera="${ordera} ${x}" 225 ordera="${ordera} ${x}"
133 fi 226 fi
134 done 227 done
135 order="${ordera}" 228 order=${ordera}
136 fi 229 fi
137 else 230 else
138 order="${DEFAULT_ABI}" 231 order=${DEFAULT_ABI}
139 fi 232 fi
140 233
141 if [ -z "${order}" ]; then 234 if [[ -z ${order} ]] ; then
142 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." 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."
143 fi 236 fi
144 237
145 echo ${order} 238 echo ${order}
146 return 0 239 return 0
147} 240}
148 241
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
149# get_all_libdir() 263# get_all_libdirs()
150# Returns a list of all the libdirs used by this profile. This includes 264# Returns a list of all the libdirs used by this profile. This includes
151# those that might not be touched by the current ebuild. 265# those that might not be touched by the current ebuild.
152get_all_libdirs() { 266get_all_libdirs() {
153 local libdirs="lib" 267 local libdirs="lib"
154 local abi 268 local abi
155 local dir 269 local dir
156 270
157 if [ -n "${MULTILIB_ABIS}" ]; then 271 if has_multilib_profile; then
158 for abi in ${MULTILIB_ABIS}; do 272 for abi in ${MULTILIB_ABIS}; do
159 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" 273 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
160 done 274 done
161 elif [ -n "${CONF_LIBDIR}" ]; then 275 elif [ -n "${CONF_LIBDIR}" ]; then
162 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:=lib32}; do 276 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:-lib32}; do
163 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}" 277 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}"
164 done 278 done
165 fi 279 fi
166 280
167 echo "${libdirs}" 281 echo "${libdirs}"
169 283
170# Return true if ${ABI} is the last ABI on our list (or if we're not 284# Return true if ${ABI} is the last ABI on our list (or if we're not
171# using the new multilib configuration. This can be used to determine 285# using the new multilib configuration. This can be used to determine
172# if we're in the last (or only) run through src_{unpack,compile,install} 286# if we're in the last (or only) run through src_{unpack,compile,install}
173is_final_abi() { 287is_final_abi() {
174 [ -z "${ABI}" ] && return 0 288 has_multilib_profile || return 0
175 local ALL_ABIS=$(get_abi_order) 289 local ALL_ABIS=$(get_install_abis)
176 local LAST_ABI=${ALL_ABIS/* /} 290 local LAST_ABI=${ALL_ABIS/* /}
177 [ "${LAST_ABI}" = "${ABI}" ] 291 [[ ${LAST_ABI} == ${ABI} ]]
178} 292}
179 293
180# echo the number of ABIs we will be installing for 294# echo the number of ABIs we will be installing for
181number_abis() { 295number_abis() {
182 get_abi_order | wc -w 296 get_install_abis | wc -w
297}
298
299# get_ml_incdir [<include dir> [<ABI>]]
300# include dir defaults to /usr/include
301# ABI defaults to ${ABI} or ${DEFAULT_ABI}
302get_ml_incdir() {
303 local dir=/usr/include
304
305 if [[ $# -gt 0 ]]; then
306 incdir=$1
307 shift
308 fi
309
310 if [[ -z "${MULTILIB_ABIS}" ]]; then
311 echo ${incdir}
312 return 0
313 fi
314
315 local abi=${ABI-${DEFAULT_ABI}}
316 if [[ $# -gt 0 ]]; then
317 abi=$1
318 shift
319 fi
320
321 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then
322 echo ${dir}/gentoo-multilib/${abi}
323 else
324 echo ${dir}
325 fi
183} 326}
184 327
185# prep_ml_includes: 328# prep_ml_includes:
186# 329#
187# Some includes (include/asm, glibc, etc) are ABI dependent. In this case, 330# Some includes (include/asm, glibc, etc) are ABI dependent. In this case,
196# ... 339# ...
197# prep_ml_includes /usr/qt/3/include 340# prep_ml_includes /usr/qt/3/include
198# } 341# }
199 342
200prep_ml_includes() { 343prep_ml_includes() {
201 local dirs
202 if [ ${#} -eq 0 ]; then
203 dirs="/usr/include"
204 else
205 dirs="${@}"
206 fi
207
208 if [ $(number_abis) -gt 1 ]; then 344 if [[ $(number_abis) -gt 1 ]] ; then
209 local dir 345 local dir
346 local dirs
347 local base
348
349 if [[ $# -eq 0 ]] ; then
350 dirs=/usr/include
351 else
352 dirs="$@"
353 fi
354
210 for dir in ${dirs}; do 355 for dir in ${dirs} ; do
356 base=${T}/gentoo-multilib/${dir}/gentoo-multilib
357 mkdir -p "${base}"
358 [[ -d ${base}/${ABI} ]] && rm -rf "${base}/${ABI}"
211 mv ${D}/${dir} ${D}/${dir}.${ABI} 359 mv "${D}/${dir}" "${base}/${ABI}"
212 done 360 done
213 361
214 if is_final_abi; then 362 if is_final_abi; then
363 base=${T}/gentoo-multilib
364 pushd "${base}"
365 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D}
366 popd
367
368 # This 'set' stuff is required by mips profiles to properly pass
369 # CDEFINE's (which have spaces) to sub-functions
370 set --
215 for dir in ${dirs}; do 371 for dir in ${dirs} ; do
216 local args="${dir}" 372 set -- "$@" "${dir}"
217 local abi 373 local abi
218 for abi in $(get_abi_order); do 374 for abi in $(get_install_abis); do
219 args="${args} $(get_abi_CDEFINE ${abi}):${dir}.${abi}" 375 set -- "$@" "$(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
220 done 376 done
221 create_ml_includes ${args} 377 create_ml_includes "$@"
222 done 378 done
223 fi 379 fi
224 fi 380 fi
225} 381}
226 382
233# 389#
234# Example: 390# Example:
235# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64 391# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
236# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64 392# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
237create_ml_includes() { 393create_ml_includes() {
238 local dest="${1}" 394 local dest=$1
239 shift 395 shift
240 local mlinfo="${@}"
241 local basedirs=$(create_ml_includes-listdirs ${mlinfo}) 396 local basedirs=$(create_ml_includes-listdirs "$@")
242 397
243 create_ml_includes-makedestdirs ${dest} ${basedirs} 398 create_ml_includes-makedestdirs ${dest} ${basedirs}
244 399
245 local file 400 local file
246 for file in $(create_ml_includes-allfiles ${basedirs}); do 401 for file in $(create_ml_includes-allfiles ${basedirs}) ; do
247 local name="$(echo $file | tr a-z A-Z | sed 's:[^A-Z]:_:g')" 402 #local name=$(echo ${file} | tr '[:lower:]' '[:upper:]' | sed 's:[^[:upper:]]:_:g')
248 { 403 (
249 echo "/* Common header file autogenerated by create_ml_includes in multilib.eclass */" 404 echo "/* Autogenerated by create_ml_includes() in multilib.eclass */"
250 #echo "#ifndef __CREATE_ML_INCLUDES_STUB_${name}__"
251 #echo "#define __CREATE_ML_INCLUDES_STUB_${name}__"
252 #echo ""
253 405
254 local dir 406 local dir
255 for dir in ${basedirs}; do 407 for dir in ${basedirs}; do
256 if [ -f "${D}/${dir}/${file}" ]; then 408 if [[ -f ${D}/${dir}/${file} ]] ; then
257 echo "#ifdef $(create_ml_includes-sym_for_dir ${dir} ${mlinfo})"
258 echo "#include \"$(create_ml_includes-relative_between ${dest}/$(dirname ${file}) ${dir}/${file})\""
259 echo "#endif /* $(create_ml_includes-sym_for_dir ${dir} ${mlinfo}) */"
260 echo "" 409 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} */"
261 fi 420 fi
262 done 421 done
263 422
264 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" 423 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
265 } > ${D}/${dest}/${file} 424 ) > "${D}/${dest}/${file}"
266 done 425 done
267} 426}
268 427
269# Helper function for create_ml_includes 428# Helper function for create_ml_includes
270create_ml_includes-relative_between() { 429create_ml_includes-absolute() {
271 local src="$(create_ml_includes-tidy_path ${1})"
272 local dst="$(create_ml_includes-tidy_path ${2})" 430 local dst="$(create_ml_includes-tidy_path $1)"
273 431
274 src=(${src//\// })
275 dst=(${dst//\// }) 432 dst=(${dst//\// })
276 433
277 local i 434 local i
278 for ((i=0; i<${#src[*]}; i++)); do 435 for ((i=0; i<${#dst[*]}; i++)); do
279 [ "${dst[i]}" != "${src[i]}" ] && break 436 [ "${dst[i]}" == "include" ] && break
280 done 437 done
281 438
282 local common=$i 439 local strip_upto=$i
283 440
284 for ((i=${#src[*]}; i>common; i--)); do
285 echo -n ../
286 done
287
288 for ((i=common; i<${#dst[*]}-1; i++)); do 441 for ((i=strip_upto+1; i<${#dst[*]}-1; i++)); do
289 echo -n ${dst[i]}/ 442 echo -n ${dst[i]}/
290 done 443 done
291 444
292 echo -n ${dst[i]} 445 echo -n ${dst[i]}
293} 446}
294 447
295# Helper function for create_ml_includes 448# Helper function for create_ml_includes
296create_ml_includes-tidy_path() { 449create_ml_includes-tidy_path() {
297 local removed="${1}" 450 local removed=$1
298 451
299 if [ -n "${1}" ]; then 452 if [ -n "${removed}" ]; then
300 # Remove multiple slashes 453 # Remove multiple slashes
301 while [ "${removed}" != "${removed/\/\//\/}" ]; do 454 while [ "${removed}" != "${removed/\/\//\/}" ]; do
302 removed=${removed/\/\//\/} 455 removed=${removed/\/\//\/}
303 done 456 done
304 457
307 removed=${removed//\/.\//\/} 460 removed=${removed//\/.\//\/}
308 done 461 done
309 [ "${removed##*/}" = "." ] && removed=${removed%/*} 462 [ "${removed##*/}" = "." ] && removed=${removed%/*}
310 463
311 # Removed .. directories 464 # Removed .. directories
312 # I wonder if there's a non-trivial bashism for this one... 465 while [ "${removed}" != "${removed//\/..\/}" ]; do
313 while [ "${removed}" != "$(echo ${removed} | sed -e 's:[^/]*/\.\./::')" ]; do 466 local p1="${removed%%\/..\/*}"
314 removed=$(echo ${removed} | sed -e 's:[^/]*/\.\./::') 467 local p2="${removed#*\/..\/}"
468
469 removed="${p1%\/*}/${p2}"
315 done 470 done
316 471
317 # Remove trailing .. 472 # Remove trailing ..
318 removed=$(echo ${removed} | sed -e 's:/[^/]*/\.\.$::') 473 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*}
319 474
320 # Remove trailing / 475 # Remove trailing /
321 [ "${removed##*/}" = "" ] && removed=${removed%/*} 476 [ "${removed##*/}" = "" ] && removed=${removed%/*}
322 477
323 echo ${removed} 478 echo ${removed}
324 fi 479 fi
325} 480}
326 481
327# Helper function for create_ml_includes 482# Helper function for create_ml_includes
328create_ml_includes-listdirs() { 483create_ml_includes-listdirs() {
329 local dirs 484 local dirs
330 local data 485 local data
331 for data in ${@}; do 486 for data in "$@"; do
332 dirs="${dirs} ${data/*:/}" 487 dirs="${dirs} ${data/*:/}"
333 done 488 done
334 echo ${dirs:1} 489 echo ${dirs:1}
335} 490}
336 491
337# Helper function for create_ml_includes 492# Helper function for create_ml_includes
338create_ml_includes-makedestdirs() { 493create_ml_includes-makedestdirs() {
339 local dest=${1} 494 local dest=$1
340 shift 495 shift
341 local basedirs=${@} 496 local basedirs=$@
342 497
343 dodir ${dest} 498 dodir ${dest}
344 499
345 local basedir 500 local basedir
346 for basedir in ${basedirs}; do 501 for basedir in ${basedirs}; do
351 done 506 done
352} 507}
353 508
354# Helper function for create_ml_includes 509# Helper function for create_ml_includes
355create_ml_includes-allfiles() { 510create_ml_includes-allfiles() {
356 local basedirs=${@} 511 local basedir file
357
358 local files
359 for basedir in ${basedirs}; do 512 for basedir in "$@" ; do
360 local file
361 for file in $(find ${D}/${basedir} -type f); do 513 for file in $(find "${D}"/${basedir} -type f); do
362 echo ${file/${D}\/${basedir}\//} 514 echo ${file/${D}\/${basedir}\//}
363 done 515 done
364 done | sort | uniq 516 done | sort | uniq
365} 517}
366 518
367# Helper function for create_ml_includes 519# Helper function for create_ml_includes
368create_ml_includes-sym_for_dir() { 520create_ml_includes-sym_for_dir() {
369 local dir="${1}" 521 local dir=$1
370 shift 522 shift
371 local data 523 local data
372 for data in ${@}; do 524 for data in "$@"; do
373 if [ "${dir}" = "${data/*:/}" ]; then 525 if [[ ${data} == *:${dir} ]] ; then
374 echo ${data/:*/} 526 echo ${data/:*/}
375 return 0 527 return 0
376 fi 528 fi
377 done 529 done
378 echo "Should be here -- create_ml_includes-sym_for_dir ${1} ${@}" 530 echo "Shouldn't be here -- create_ml_includes-sym_for_dir $1 $@"
379 # exit because we'll likely be called from a subshell 531 # exit because we'll likely be called from a subshell
380 exit 1 532 exit 1
381} 533}
534
535get_libname() {
536 local ver=$1
537 if use userland_Darwin ; then
538 if [ -z ${ver} ] ; then
539 echo ".dylib"
540 else
541 echo ".${ver}.dylib"
542 fi
543 else
544 if [ -z ${ver} ] ; then
545 echo ".so"
546 else
547 echo ".so.${ver}"
548 fi
549 fi
550}
551
552# This is for the toolchain to setup profile variables when pulling in
553# a crosscompiler (and thus they aren't set in the profile)
554multilib_env() {
555 local CTARGET=$1
556 local CTARGET_post=${CTARGET#*-}
557
558 case ${CTARGET} in
559 x86_64*)
560 export CFLAGS_x86=${CFLAGS_x86--m32}
561 export CHOST_x86=i686-${CTARGET_post}
562 export CTARGET_x86=i686-${CTARGET_post}
563 export CDEFINE_x86="__i386__"
564 export LIBDIR_x86="lib"
565
566 export CFLAGS_amd64=${CFLAGS_amd64--m64}
567 export CHOST_amd64=x86_64-${CTARGET_post}
568 export CTARGET_amd64=x86_64-${CTARGET_post}
569 export CDEFINE_amd64="__x86_64__"
570 export LIBDIR_amd64="lib64"
571
572 export MULTILIB_ABIS="amd64 x86"
573 export DEFAULT_ABI="amd64"
574 ;;
575 mips64*)
576 export CFLAGS_o32=${CFLAGS_o32--mabi=32}
577 export CHOST_o32=mips-${CTARGET_post}
578 export CTARGET_o32=mips-${CTARGET_post}
579 export CDEFINE_o32="_MIPS_SIM == _ABIO32"
580 export LIBDIR_o32="lib"
581
582 export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
583 export CHOST_n32=mips64-${CTARGET_post}
584 export CTARGET_n32=mips64-${CTARGET_post}
585 export CDEFINE_n32="_MIPS_SIM == _ABIN32"
586 export LIBDIR_n32="lib32"
587
588 export CFLAGS_n64=${CFLAGS_n64--mabi=64}
589 export CHOST_n64=mips64-${CTARGET_post}
590 export CTARGET_n64=mips64-${CTARGET_post}
591 export CDEFINE_n64="_MIPS_SIM == _ABI64"
592 export LIBDIR_n64="lib64"
593
594 export MULTILIB_ABIS="n64 n32 o32"
595 export DEFAULT_ABI="n32"
596 ;;
597 powerpc64*)
598 export CFLAGS_ppc=${CFLAGS_ppc--m32}
599 export CHOST_ppc=powerpc-${CTARGET_post}
600 export CTARGET_ppc=powerpc-${CTARGET_post}
601 export CDEFINE_ppc="!__powerpc64__"
602 export LIBDIR_ppc="lib"
603
604 export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
605 export CHOST_ppc64=powerpc64-${CTARGET_post}
606 export CTARGET_ppc64=powerpc64-${CTARGET_post}
607 export CDEFINE_ppc64="__powerpc64__"
608 export LIBDIR_ppc64="lib64"
609
610 export MULTILIB_ABIS="ppc64 ppc"
611 export DEFAULT_ABI="ppc64"
612 ;;
613 sparc64*)
614 export CFLAGS_sparc32=${CFLAGS_sparc32--m32}
615 export CHOST_sparc32=sparc-${CTARGET_post}
616 export CTARGET_sparc32=sparc-${CTARGET_post}
617 export CDEFINE_sparc32="!__arch64__"
618 export LIBDIR_sparc32="lib"
619
620 export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
621 export CHOST_sparc64=sparc64-${CTARGET_post}
622 export CTARGET_sparc64=sparc64-${CTARGET_post}
623 export CDEFINE_sparc64="__arch64__"
624 export LIBDIR_sparc64="lib64"
625
626 export MULTILIB_ABIS="sparc64 sparc32"
627 export DEFAULT_ABI="sparc64"
628 ;;
629 *)
630 export MULTILIB_ABIS="default"
631 export DEFAULT_ABI="default"
632 ;;
633 esac
634}

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.39

  ViewVC Help
Powered by ViewVC 1.1.20