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

Diff of /eclass/multilib.eclass

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

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

Legend:
Removed from v.1.11  
changed lines
  Added in v.1.36

  ViewVC Help
Powered by ViewVC 1.1.20