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