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

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

  ViewVC Help
Powered by ViewVC 1.1.20