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

Diff of /eclass/multilib.eclass

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

Revision 1.12 Revision 1.38
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.12 2005/01/17 04:17:53 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.38 2005/10/07 02:24:47 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"}
99export CFLAGS_default
100export LDFLAGS_default
101export CHOST_default=${CHOST_default:-${CHOST}}
102export CTARGET_default=${CTARGET_default:-${CTARGET}}
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}
14 110
15# This function simply returns the desired lib directory. With portage 111# This function simply returns the desired lib directory. With portage
16# 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
17# 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
18# 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
24# 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,
25# 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
26# 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
27# over CONF_LIBDIR in econf, dolib, etc... 123# over CONF_LIBDIR in econf, dolib, etc...
28get_libdir() { 124get_libdir() {
29 LIBDIR_TEST=$(type econf) 125 local CONF_LIBDIR
30 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 126 if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then
31 # if there is an override, we want to use that... always. 127 # if there is an override, we want to use that... always.
32 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 128 echo ${CONF_LIBDIR_OVERRIDE}
33 elif [ -n "$(get_abi_LIBDIR)" ]; then 129 else
34 CONF_LIBDIR="$(get_abi_LIBDIR)" 130 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 131 fi
39 # and of course, default to lib if CONF_LIBDIR isnt set
40 echo ${CONF_LIBDIR:=lib}
41 unset LIBDIR_TEST
42} 132}
43 133
44get_multilibdir() { 134get_multilibdir() {
45 if [ -n "$(get_abi_LIBDIR)" ]; then 135 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" 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"
47 exit 1 137 exit 1
48 fi 138 fi
49 echo ${CONF_MULTILIBDIR:=lib32} 139 echo ${CONF_MULTILIBDIR:=lib32}
50} 140}
59# 149#
60# get_libdir_override lib64 150# get_libdir_override lib64
61# 151#
62# Travis Tilley <lv@gentoo.org> (31 Aug 2004) 152# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
63get_libdir_override() { 153get_libdir_override() {
64 if [ -n "$(get_abi_LIBDIR)" ]; then 154 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" 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"
66 exit 1 156 exit 1
67 fi 157 fi
68 CONF_LIBDIR="$1" 158 CONF_LIBDIR="$1"
69 CONF_LIBDIR_OVERRIDE="$1" 159 CONF_LIBDIR_OVERRIDE="$1"
160 LIBDIR_default="$1"
70} 161}
71 162
72# get_abi_var <VAR> [<ABI>] 163# get_abi_var <VAR> [<ABI>]
73# 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
74# 165#
82# 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.
83# 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.
84# 175#
85# Jeremy Huddleston <eradicator@gentoo.org> 176# Jeremy Huddleston <eradicator@gentoo.org>
86get_abi_var() { 177get_abi_var() {
87 local flag=${1} 178 local flag=$1
88 local abi 179 local abi
89 if [ $# -gt 1 ]; then 180 if [ $# -gt 1 ]; then
90 abi=${2} 181 abi=${2}
91 elif [ -n "${ABI}" ]; then 182 elif [ -n "${ABI}" ]; then
92 abi=${ABI} 183 abi=${ABI}
93 elif [ -n "${DEFAULT_ABI}" ]; then 184 elif [ -n "${DEFAULT_ABI}" ]; then
94 abi=${DEFAULT_ABI} 185 abi=${DEFAULT_ABI}
95 else 186 else
96 return 1 187 abi="default"
97 fi 188 fi
98 189
99 local var="${flag}_${abi}" 190 local var="${flag}_${abi}"
100 echo ${!var} 191 echo ${!var}
101} 192}
102 193
103get_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 "$@"; }
104get_abi_CDEFINE() { get_abi_var CDEFINE ${@}; } 199get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; }
105get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; } 200get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; }
106 201
107# 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
108# the last one in the list being the default. 203# the last one in the list being the default.
109get_abi_order() { 204get_install_abis() {
110 local order="" 205 local order=""
111 206
112 if [ -z "${MULTILIB_ABIS}" ]; then 207 if [[ -z ${MULTILIB_ABIS} ]] ; then
113 echo "NOMULTILIB" 208 echo "default"
114 return 1 209 return 0
115 fi 210 fi
116 211
117 if hasq multilib-pkg-force ${RESTRICT} || 212 if hasq multilib-pkg-force ${RESTRICT} ||
118 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then 213 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
119 for x in ${MULTILIB_ABIS}; do 214 for x in ${MULTILIB_ABIS} ; do
120 if [ "${x}" != "${DEFAULT_ABI}" ]; then 215 if [[ ${x} != "${DEFAULT_ABI}" ]] ; then
121 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}" 216 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}"
122 fi 217 fi
123 done 218 done
124 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}" 219 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}"
125 220
126 if [ -n "${ABI_ALLOW}" ]; then 221 if [[ -n ${ABI_ALLOW} ]] ; then
127 local ordera="" 222 local ordera=""
128 for x in ${order}; do 223 for x in ${order} ; do
129 if hasq ${x} ${ABI_ALLOW}; then 224 if hasq ${x} ${ABI_ALLOW} ; then
130 ordera="${ordera} ${x}" 225 ordera="${ordera} ${x}"
131 fi 226 fi
132 done 227 done
133 order="${ordera}" 228 order=${ordera}
134 fi 229 fi
135 else 230 else
136 order="${DEFAULT_ABI}" 231 order=${DEFAULT_ABI}
137 fi 232 fi
138 233
139 if [ -z "${order}" ]; then 234 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." 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."
141 fi 236 fi
142 237
143 echo ${order} 238 echo ${order}
144 return 0 239 return 0
145} 240}
146 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
147# get_all_libdir() 263# get_all_libdirs()
148# 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
149# those that might not be touched by the current ebuild. 265# those that might not be touched by the current ebuild.
150get_all_libdirs() { 266get_all_libdirs() {
151 local libdirs="lib" 267 local libdirs="lib"
152 local abi 268 local abi
153 local dir 269 local dir
154 270
155 if [ -n "${MULTILIB_ABIS}" ]; then 271 if has_multilib_profile; then
156 for abi in ${MULTILIB_ABIS}; do 272 for abi in ${MULTILIB_ABIS}; do
157 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" 273 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
158 done 274 done
159 elif [ -n "${CONF_LIBDIR}" ]; then 275 elif [ -n "${CONF_LIBDIR}" ]; then
160 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:=lib32}; do 276 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:-lib32}; do
161 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}" 277 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}"
162 done 278 done
163 fi 279 fi
164 280
165 echo "${libdirs}" 281 echo "${libdirs}"
167 283
168# 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
169# using the new multilib configuration. This can be used to determine 285# 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} 286# if we're in the last (or only) run through src_{unpack,compile,install}
171is_final_abi() { 287is_final_abi() {
172 [ -z "${ABI}" ] && return 0 288 has_multilib_profile || return 0
173 local ALL_ABIS=$(get_abi_order) 289 local ALL_ABIS=$(get_install_abis)
174 local LAST_ABI=${ALL_ABIS/* /} 290 local LAST_ABI=${ALL_ABIS/* /}
175 [ "${LAST_ABI}" = "${ABI}" ] 291 [[ ${LAST_ABI} == ${ABI} ]]
176} 292}
177 293
178# echo the number of ABIs we will be installing for 294# echo the number of ABIs we will be installing for
179number_abis() { 295number_abis() {
180 get_abi_order | wc -w 296 get_install_abis | wc -w
181} 297}
182 298
183# get_ml_incdir [<include dir> [<ABI>]] 299# get_ml_incdir [<include dir> [<ABI>]]
184# include dir defaults to /usr/include 300# include dir defaults to /usr/include
185# ABI defaults to ${ABI} or ${DEFAULT_ABI} 301# ABI defaults to ${ABI} or ${DEFAULT_ABI}
186get_ml_incdir() { 302get_ml_incdir() {
187 local dir=/usr/include 303 local dir=/usr/include
188 304
189 if [[ ${#} -gt 0 ]]; then 305 if [[ $# -gt 0 ]]; then
190 incdir=${1} 306 incdir=$1
191 shift 307 shift
192 fi 308 fi
193 309
194 if [[ -z "${MULTILIB_ABIS}" ]]; then 310 if [[ -z "${MULTILIB_ABIS}" ]]; then
195 echo ${incdir} 311 echo ${incdir}
196 return 0 312 return 0
197 fi 313 fi
198 314
199 local abi=${ABI:-${DEFAULT_ABI}} 315 local abi=${ABI-${DEFAULT_ABI}}
200 if [[ ${#} -gt 0 ]]; then 316 if [[ $# -gt 0 ]]; then
201 abi=${1} 317 abi=$1
202 shift 318 shift
203 fi 319 fi
204 320
205 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then 321 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then
206 echo ${dir}/gentoo-multilib/${abi} 322 echo ${dir}/gentoo-multilib/${abi}
223# ... 339# ...
224# prep_ml_includes /usr/qt/3/include 340# prep_ml_includes /usr/qt/3/include
225# } 341# }
226 342
227prep_ml_includes() { 343prep_ml_includes() {
228 if [ $(number_abis) -gt 1 ]; then 344 if [[ $(number_abis) -gt 1 ]] ; then
229 local dir 345 local dir
230 local dirs 346 local dirs
231 local base 347 local base
232 348
233 if [ ${#} -eq 0 ]; then 349 if [[ $# -eq 0 ]] ; then
234 dirs="/usr/include" 350 dirs=/usr/include
235 else 351 else
236 dirs="${@}" 352 dirs="$@"
237 fi 353 fi
238 354
239 for dir in ${dirs}; do 355 for dir in ${dirs} ; do
240 base=${T}/gentoo-multilib/${dir}/gentoo-multilib 356 base=${T}/gentoo-multilib/${dir}/gentoo-multilib
241 mkdir -p ${base} 357 mkdir -p "${base}"
242 [ -d ${base}/${ABI} ] && rm -rf ${base}/${ABI} 358 [[ -d ${base}/${ABI} ]] && rm -rf "${base}/${ABI}"
243 mv ${D}/${dir} ${base}/${ABI} 359 mv "${D}/${dir}" "${base}/${ABI}"
244 done 360 done
245 361
246 if is_final_abi; then 362 if is_final_abi; then
247 base=${T}/gentoo-multilib 363 base=${T}/gentoo-multilib
248 pushd ${base} 364 pushd "${base}"
249 find . | cpio -pmd --no-preserve-owner ${D} 365 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D}
250 popd 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 --
371 for dir in ${dirs} ; do
372 set -- "$@" "${dir}"
251 local args 373 local abi
252 for abi in $(get_abi_order); do 374 for abi in $(get_install_abis); do
253 args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}" 375 set -- "$@" "$(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
376 done
377 create_ml_includes "$@"
254 done 378 done
255 create_ml_includes ${args}
256
257 fi 379 fi
258 fi 380 fi
259} 381}
260 382
261# If you need more control than prep_ml_includes can offer (like linux-headers 383# If you need more control than prep_ml_includes can offer (like linux-headers
267# 389#
268# Example: 390# Example:
269# 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
270# 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
271create_ml_includes() { 393create_ml_includes() {
272 local dest="${1}" 394 local dest=$1
273 shift 395 shift
274 local mlinfo="${@}"
275 local basedirs=$(create_ml_includes-listdirs ${mlinfo}) 396 local basedirs=$(create_ml_includes-listdirs "$@")
276 397
277 create_ml_includes-makedestdirs ${dest} ${basedirs} 398 create_ml_includes-makedestdirs ${dest} ${basedirs}
278 399
279 local file 400 local file
280 for file in $(create_ml_includes-allfiles ${basedirs}); do 401 for file in $(create_ml_includes-allfiles ${basedirs}) ; do
281 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')
282 { 403 (
283 echo "/* Common header file autogenerated by create_ml_includes in multilib.eclass */" 404 echo "/* Autogenerated by create_ml_includes() in multilib.eclass */"
284 #echo "#ifndef __CREATE_ML_INCLUDES_STUB_${name}__"
285 #echo "#define __CREATE_ML_INCLUDES_STUB_${name}__"
286 #echo ""
287 405
288 local dir 406 local dir
289 for dir in ${basedirs}; do 407 for dir in ${basedirs}; do
290 if [ -f "${D}/${dir}/${file}" ]; then 408 if [[ -f ${D}/${dir}/${file} ]] ; then
291 echo "#ifdef $(create_ml_includes-sym_for_dir ${dir} ${mlinfo})"
292 echo "#include \"$(create_ml_includes-relative_between ${dest}/$(dirname ${file}) ${dir}/${file})\""
293 echo "#endif /* $(create_ml_includes-sym_for_dir ${dir} ${mlinfo}) */"
294 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} */"
295 fi 420 fi
296 done 421 done
297 422
298 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" 423 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
299 } > ${D}/${dest}/${file} 424 ) > "${D}/${dest}/${file}"
300 done 425 done
301} 426}
302 427
303# Helper function for create_ml_includes 428# Helper function for create_ml_includes
304create_ml_includes-relative_between() { 429create_ml_includes-absolute() {
305 local src="$(create_ml_includes-tidy_path ${1})"
306 local dst="$(create_ml_includes-tidy_path ${2})" 430 local dst="$(create_ml_includes-tidy_path $1)"
307 431
308 src=(${src//\// })
309 dst=(${dst//\// }) 432 dst=(${dst//\// })
310 433
311 local i 434 local i
312 for ((i=0; i<${#src[*]}; i++)); do 435 for ((i=0; i<${#dst[*]}; i++)); do
313 [ "${dst[i]}" != "${src[i]}" ] && break 436 [ "${dst[i]}" == "include" ] && break
314 done 437 done
315 438
316 local common=$i 439 local strip_upto=$i
317 440
318 for ((i=${#src[*]}; i>common; i--)); do
319 echo -n ../
320 done
321
322 for ((i=common; i<${#dst[*]}-1; i++)); do 441 for ((i=strip_upto+1; i<${#dst[*]}-1; i++)); do
323 echo -n ${dst[i]}/ 442 echo -n ${dst[i]}/
324 done 443 done
325 444
326 echo -n ${dst[i]} 445 echo -n ${dst[i]}
327} 446}
328 447
329# Helper function for create_ml_includes 448# Helper function for create_ml_includes
330create_ml_includes-tidy_path() { 449create_ml_includes-tidy_path() {
331 local removed="${1}" 450 local removed=$1
332 451
333 if [ -n "${removed}" ]; then 452 if [ -n "${removed}" ]; then
334 # Remove multiple slashes 453 # Remove multiple slashes
335 while [ "${removed}" != "${removed/\/\//\/}" ]; do 454 while [ "${removed}" != "${removed/\/\//\/}" ]; do
336 removed=${removed/\/\//\/} 455 removed=${removed/\/\//\/}
353 # Remove trailing .. 472 # Remove trailing ..
354 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*} 473 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*}
355 474
356 # Remove trailing / 475 # Remove trailing /
357 [ "${removed##*/}" = "" ] && removed=${removed%/*} 476 [ "${removed##*/}" = "" ] && removed=${removed%/*}
358 477
359 echo ${removed} 478 echo ${removed}
360 fi 479 fi
361} 480}
362 481
363# Helper function for create_ml_includes 482# Helper function for create_ml_includes
364create_ml_includes-listdirs() { 483create_ml_includes-listdirs() {
365 local dirs 484 local dirs
366 local data 485 local data
367 for data in ${@}; do 486 for data in "$@"; do
368 dirs="${dirs} ${data/*:/}" 487 dirs="${dirs} ${data/*:/}"
369 done 488 done
370 echo ${dirs:1} 489 echo ${dirs:1}
371} 490}
372 491
373# Helper function for create_ml_includes 492# Helper function for create_ml_includes
374create_ml_includes-makedestdirs() { 493create_ml_includes-makedestdirs() {
375 local dest=${1} 494 local dest=$1
376 shift 495 shift
377 local basedirs=${@} 496 local basedirs=$@
378 497
379 dodir ${dest} 498 dodir ${dest}
380 499
381 local basedir 500 local basedir
382 for basedir in ${basedirs}; do 501 for basedir in ${basedirs}; do
387 done 506 done
388} 507}
389 508
390# Helper function for create_ml_includes 509# Helper function for create_ml_includes
391create_ml_includes-allfiles() { 510create_ml_includes-allfiles() {
392 local basedirs=${@}
393
394 local basedir 511 local basedir file
395 for basedir in ${basedirs}; do 512 for basedir in "$@" ; do
396 local file
397 for file in $(find ${D}/${basedir} -type f); do 513 for file in $(find "${D}"/${basedir} -type f); do
398 echo ${file/${D}\/${basedir}\//} 514 echo ${file/${D}\/${basedir}\//}
399 done 515 done
400 done | sort | uniq 516 done | sort | uniq
401} 517}
402 518
403# Helper function for create_ml_includes 519# Helper function for create_ml_includes
404create_ml_includes-sym_for_dir() { 520create_ml_includes-sym_for_dir() {
405 local dir="${1}" 521 local dir=$1
406 shift 522 shift
407 local data 523 local data
408 for data in ${@}; do 524 for data in "$@"; do
409 if [ "${dir}" = "${data/*:/}" ]; then 525 if [[ ${data} == *:${dir} ]] ; then
410 echo ${data/:*/} 526 echo ${data/:*/}
411 return 0 527 return 0
412 fi 528 fi
413 done 529 done
414 echo "Shouldn't be here -- create_ml_includes-sym_for_dir ${1} ${@}" 530 echo "Shouldn't be here -- create_ml_includes-sym_for_dir $1 $@"
415 # exit because we'll likely be called from a subshell 531 # exit because we'll likely be called from a subshell
416 exit 1 532 exit 1
417} 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.12  
changed lines
  Added in v.1.38

  ViewVC Help
Powered by ViewVC 1.1.20