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

Diff of /eclass/multilib.eclass

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

Revision 1.15 Revision 1.31
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.15 2005/01/27 22:07:36 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.31 2005/08/08 20:07:43 kito 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
15# has_multilib_profile: 13# has_multilib_profile:
16# Return true if the current profile is a multilib profile and lists more than 14# Return true if the current profile is a multilib profile and lists more than
23# on our last run through a src_* function. 21# on our last run through a src_* function.
24 22
25# number_abis: 23# number_abis:
26# echo the number of ABIs we will be installing for 24# echo the number of ABIs we will be installing for
27 25
28# get_abi_order: 26# get_install_abis:
29# Return a list of the ABIs we want to install for with 27# Return a list of the ABIs we want to install for with
30# the last one in the list being the default. 28# the last one in the list being the default.
31 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
32# get_all_libdir: 34# get_all_libdirs:
33# Returns a list of all the libdirs used by this profile. This includes 35# Returns a list of all the libdirs used by this profile. This includes
34# those that might not be touched by the current ebuild and always includes 36# those that might not be touched by the current ebuild and always includes
35# "lib". 37# "lib".
36 38
37# get_libdir: 39# get_libdir:
80# 82#
81# Example: 83# Example:
82# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64 84# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
83# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64 85# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
84 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
85### END DOCUMENTATION ### 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__"
86 107
87# has_multilib_profile() 108# has_multilib_profile()
88has_multilib_profile() { 109has_multilib_profile() {
89 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ] 110 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ]
90} 111}
101# 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,
102# 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
103# 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
104# over CONF_LIBDIR in econf, dolib, etc... 125# over CONF_LIBDIR in econf, dolib, etc...
105get_libdir() { 126get_libdir() {
106 LIBDIR_TEST=$(type econf) 127 local CONF_LIBDIR
107 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 128 if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then
108 # if there is an override, we want to use that... always. 129 # if there is an override, we want to use that... always.
109 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 130 echo ${CONF_LIBDIR_OVERRIDE}
110 elif [ -n "$(get_abi_LIBDIR)" ]; then 131 else
111 CONF_LIBDIR="$(get_abi_LIBDIR)" 132 get_abi_LIBDIR
112 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
113 # will be <portage-2.0.51_pre20
114 CONF_LIBDIR="lib"
115 fi 133 fi
116 # and of course, default to lib if CONF_LIBDIR isnt set
117 echo ${CONF_LIBDIR:=lib}
118 unset LIBDIR_TEST
119} 134}
120 135
121get_multilibdir() { 136get_multilibdir() {
122 if [ -n "$(get_abi_LIBDIR)" ]; then 137 if has_multilib_profile; then
123 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"
124 exit 1 139 exit 1
125 fi 140 fi
126 echo ${CONF_MULTILIBDIR:=lib32} 141 echo ${CONF_MULTILIBDIR:=lib32}
127} 142}
136# 151#
137# get_libdir_override lib64 152# get_libdir_override lib64
138# 153#
139# Travis Tilley <lv@gentoo.org> (31 Aug 2004) 154# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
140get_libdir_override() { 155get_libdir_override() {
141 if [ -n "$(get_abi_LIBDIR)" ]; then 156 if has_multilib_profile; then
142 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"
143 exit 1 158 exit 1
144 fi 159 fi
145 CONF_LIBDIR="$1" 160 CONF_LIBDIR="$1"
146 CONF_LIBDIR_OVERRIDE="$1" 161 CONF_LIBDIR_OVERRIDE="$1"
162 LIBDIR_default="$1"
147} 163}
148 164
149# get_abi_var <VAR> [<ABI>] 165# get_abi_var <VAR> [<ABI>]
150# 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
151# 167#
168 elif [ -n "${ABI}" ]; then 184 elif [ -n "${ABI}" ]; then
169 abi=${ABI} 185 abi=${ABI}
170 elif [ -n "${DEFAULT_ABI}" ]; then 186 elif [ -n "${DEFAULT_ABI}" ]; then
171 abi=${DEFAULT_ABI} 187 abi=${DEFAULT_ABI}
172 else 188 else
173 return 1 189 abi="default"
174 fi 190 fi
175 191
176 local var="${flag}_${abi}" 192 local var="${flag}_${abi}"
177 echo ${!var} 193 echo ${!var}
178} 194}
179 195
180get_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 "${@}"; }
181get_abi_CDEFINE() { get_abi_var CDEFINE ${@}; } 200get_abi_CDEFINE() { get_abi_var CDEFINE "${@}"; }
182get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; } 201get_abi_LIBDIR() { get_abi_var LIBDIR "${@}"; }
183 202
184# 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
185# the last one in the list being the default. 204# the last one in the list being the default.
186get_abi_order() { 205get_install_abis() {
187 local order="" 206 local order=""
188 207
189 if [ -z "${MULTILIB_ABIS}" ]; then 208 if [ -z "${MULTILIB_ABIS}" ]; then
190 echo "NOMULTILIB" 209 echo "default"
191 return 1 210 return 0
192 fi 211 fi
193 212
194 if hasq multilib-pkg-force ${RESTRICT} || 213 if hasq multilib-pkg-force ${RESTRICT} ||
195 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then 214 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
196 for x in ${MULTILIB_ABIS}; do 215 for x in ${MULTILIB_ABIS}; do
197 if [ "${x}" != "${DEFAULT_ABI}" ]; then 216 if [ "${x}" != "${DEFAULT_ABI}" ]; then
198 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}" 217 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}"
199 fi 218 fi
219 238
220 echo ${order} 239 echo ${order}
221 return 0 240 return 0
222} 241}
223 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
224# get_all_libdir() 264# get_all_libdirs()
225# 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
226# those that might not be touched by the current ebuild. 266# those that might not be touched by the current ebuild.
227get_all_libdirs() { 267get_all_libdirs() {
228 local libdirs="lib" 268 local libdirs="lib"
229 local abi 269 local abi
232 if has_multilib_profile; then 272 if has_multilib_profile; then
233 for abi in ${MULTILIB_ABIS}; do 273 for abi in ${MULTILIB_ABIS}; do
234 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" 274 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
235 done 275 done
236 elif [ -n "${CONF_LIBDIR}" ]; then 276 elif [ -n "${CONF_LIBDIR}" ]; then
237 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:=lib32}; do 277 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:-lib32}; do
238 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}" 278 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}"
239 done 279 done
240 fi 280 fi
241 281
242 echo "${libdirs}" 282 echo "${libdirs}"
244 284
245# 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
246# using the new multilib configuration. This can be used to determine 286# using the new multilib configuration. This can be used to determine
247# 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}
248is_final_abi() { 288is_final_abi() {
249 ! has_multilib_profile && return 0 289 has_multilib_profile || return 0
250 local ALL_ABIS=$(get_abi_order) 290 local ALL_ABIS=$(get_install_abis)
251 local LAST_ABI=${ALL_ABIS/* /} 291 local LAST_ABI=${ALL_ABIS/* /}
252 [ "${LAST_ABI}" = "${ABI}" ] 292 [[ ${LAST_ABI} == ${ABI} ]]
253} 293}
254 294
255# echo the number of ABIs we will be installing for 295# echo the number of ABIs we will be installing for
256number_abis() { 296number_abis() {
257 get_abi_order | wc -w 297 get_install_abis | wc -w
258} 298}
259 299
260# get_ml_incdir [<include dir> [<ABI>]] 300# get_ml_incdir [<include dir> [<ABI>]]
261# include dir defaults to /usr/include 301# include dir defaults to /usr/include
262# ABI defaults to ${ABI} or ${DEFAULT_ABI} 302# ABI defaults to ${ABI} or ${DEFAULT_ABI}
271 if [[ -z "${MULTILIB_ABIS}" ]]; then 311 if [[ -z "${MULTILIB_ABIS}" ]]; then
272 echo ${incdir} 312 echo ${incdir}
273 return 0 313 return 0
274 fi 314 fi
275 315
276 local abi=${ABI:-${DEFAULT_ABI}} 316 local abi=${ABI-${DEFAULT_ABI}}
277 if [[ ${#} -gt 0 ]]; then 317 if [[ ${#} -gt 0 ]]; then
278 abi=${1} 318 abi=${1}
279 shift 319 shift
280 fi 320 fi
281 321
327 popd 367 popd
328 368
329 for dir in ${dirs}; do 369 for dir in ${dirs}; do
330 local args=${dir} 370 local args=${dir}
331 local abi 371 local abi
332 for abi in $(get_abi_order); do 372 for abi in $(get_install_abis); do
333 args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}" 373 args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
334 done 374 done
335 create_ml_includes ${args} 375 create_ml_includes ${args}
336 done 376 done
337 fi 377 fi
359 local file 399 local file
360 for file in $(create_ml_includes-allfiles ${basedirs}); do 400 for file in $(create_ml_includes-allfiles ${basedirs}); do
361 local name="$(echo $file | tr a-z A-Z | sed 's:[^A-Z]:_:g')" 401 local name="$(echo $file | tr a-z A-Z | sed 's:[^A-Z]:_:g')"
362 { 402 {
363 echo "/* Common header file autogenerated by create_ml_includes in multilib.eclass */" 403 echo "/* Common header file autogenerated by create_ml_includes in multilib.eclass */"
364 #echo "#ifndef __CREATE_ML_INCLUDES_STUB_${name}__"
365 #echo "#define __CREATE_ML_INCLUDES_STUB_${name}__"
366 #echo ""
367 404
368 local dir 405 local dir
369 for dir in ${basedirs}; do 406 for dir in ${basedirs}; do
370 if [ -f "${D}/${dir}/${file}" ]; then 407 if [ -f "${D}/${dir}/${file}" ]; then
371 echo "#ifdef $(create_ml_includes-sym_for_dir ${dir} ${mlinfo})" 408 local sym=$(create_ml_includes-sym_for_dir ${dir} ${mlinfo})
372 echo "#include \"$(create_ml_includes-relative_between ${dest}/$(dirname ${file}) ${dir}/${file})\"" 409 if [[ ${sym::1} == "!" ]]; then
373 echo "#endif /* $(create_ml_includes-sym_for_dir ${dir} ${mlinfo}) */" 410 echo "#ifndef ${sym:1}"
411 else
412 echo "#ifdef ${sym}"
413 fi
414 echo "#include <$(create_ml_includes-absolute ${dir}/${file})>"
415 echo "#endif /* ${sym} */"
374 echo "" 416 echo ""
375 fi 417 fi
376 done 418 done
377 419
378 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" 420 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
379 } > ${D}/${dest}/${file} 421 } > ${D}/${dest}/${file}
380 done 422 done
381} 423}
382 424
383# Helper function for create_ml_includes 425# Helper function for create_ml_includes
384create_ml_includes-relative_between() { 426create_ml_includes-absolute() {
385 local src="$(create_ml_includes-tidy_path ${1})"
386 local dst="$(create_ml_includes-tidy_path ${2})" 427 local dst="$(create_ml_includes-tidy_path ${1})"
387 428
388 src=(${src//\// })
389 dst=(${dst//\// }) 429 dst=(${dst//\// })
390 430
391 local i 431 local i
392 for ((i=0; i<${#src[*]}; i++)); do 432 for ((i=0; i<${#dst[*]}; i++)); do
393 [ "${dst[i]}" != "${src[i]}" ] && break 433 [ "${dst[i]}" == "include" ] && break
394 done 434 done
395 435
396 local common=$i 436 local strip_upto=$i
397 437
398 for ((i=${#src[*]}; i>common; i--)); do
399 echo -n ../
400 done
401
402 for ((i=common; i<${#dst[*]}-1; i++)); do 438 for ((i=strip_upto+1; i<${#dst[*]}-1; i++)); do
403 echo -n ${dst[i]}/ 439 echo -n ${dst[i]}/
404 done 440 done
405 441
406 echo -n ${dst[i]} 442 echo -n ${dst[i]}
407} 443}
433 # Remove trailing .. 469 # Remove trailing ..
434 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*} 470 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*}
435 471
436 # Remove trailing / 472 # Remove trailing /
437 [ "${removed##*/}" = "" ] && removed=${removed%/*} 473 [ "${removed##*/}" = "" ] && removed=${removed%/*}
438 474
439 echo ${removed} 475 echo ${removed}
440 fi 476 fi
441} 477}
442 478
443# Helper function for create_ml_includes 479# Helper function for create_ml_includes
493 done 529 done
494 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} ${@}"
495 # exit because we'll likely be called from a subshell 531 # exit because we'll likely be called from a subshell
496 exit 1 532 exit 1
497} 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

Legend:
Removed from v.1.15  
changed lines
  Added in v.1.31

  ViewVC Help
Powered by ViewVC 1.1.20