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

Diff of /eclass/multilib.eclass

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

Revision 1.17 Revision 1.32
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.17 2005/02/03 05:29:07 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.32 2005/08/22 16:20:30 swegener 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
84# 82#
85# Example: 83# Example:
86# 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
87# 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
88 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
89### 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__"
90 107
91# has_multilib_profile() 108# has_multilib_profile()
92has_multilib_profile() { 109has_multilib_profile() {
93 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ] 110 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ]
94} 111}
105# 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,
106# 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
107# 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
108# over CONF_LIBDIR in econf, dolib, etc... 125# over CONF_LIBDIR in econf, dolib, etc...
109get_libdir() { 126get_libdir() {
110 LIBDIR_TEST=$(type econf) 127 local CONF_LIBDIR
111 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 128 if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then
112 # if there is an override, we want to use that... always. 129 # if there is an override, we want to use that... always.
113 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 130 echo ${CONF_LIBDIR_OVERRIDE}
114 elif [ -n "$(get_abi_LIBDIR)" ]; then 131 else
115 CONF_LIBDIR="$(get_abi_LIBDIR)" 132 get_abi_LIBDIR
116 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
117 # will be <portage-2.0.51_pre20
118 CONF_LIBDIR="lib"
119 fi 133 fi
120 # and of course, default to lib if CONF_LIBDIR isnt set
121 echo ${CONF_LIBDIR:=lib}
122 unset LIBDIR_TEST
123} 134}
124 135
125get_multilibdir() { 136get_multilibdir() {
126 if [ -n "$(get_abi_LIBDIR)" ]; then 137 if has_multilib_profile; then
127 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"
128 exit 1 139 exit 1
129 fi 140 fi
130 echo ${CONF_MULTILIBDIR:=lib32} 141 echo ${CONF_MULTILIBDIR:=lib32}
131} 142}
140# 151#
141# get_libdir_override lib64 152# get_libdir_override lib64
142# 153#
143# Travis Tilley <lv@gentoo.org> (31 Aug 2004) 154# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
144get_libdir_override() { 155get_libdir_override() {
145 if [ -n "$(get_abi_LIBDIR)" ]; then 156 if has_multilib_profile; then
146 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"
147 exit 1 158 exit 1
148 fi 159 fi
149 CONF_LIBDIR="$1" 160 CONF_LIBDIR="$1"
150 CONF_LIBDIR_OVERRIDE="$1" 161 CONF_LIBDIR_OVERRIDE="$1"
162 LIBDIR_default="$1"
151} 163}
152 164
153# get_abi_var <VAR> [<ABI>] 165# get_abi_var <VAR> [<ABI>]
154# 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
155# 167#
172 elif [ -n "${ABI}" ]; then 184 elif [ -n "${ABI}" ]; then
173 abi=${ABI} 185 abi=${ABI}
174 elif [ -n "${DEFAULT_ABI}" ]; then 186 elif [ -n "${DEFAULT_ABI}" ]; then
175 abi=${DEFAULT_ABI} 187 abi=${DEFAULT_ABI}
176 else 188 else
177 return 1 189 abi="default"
178 fi 190 fi
179 191
180 local var="${flag}_${abi}" 192 local var="${flag}_${abi}"
181 echo ${!var} 193 echo ${!var}
182} 194}
183 195
184get_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 "${@}"; }
185get_abi_CDEFINE() { get_abi_var CDEFINE ${@}; } 200get_abi_CDEFINE() { get_abi_var CDEFINE "${@}"; }
186get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; } 201get_abi_LIBDIR() { get_abi_var LIBDIR "${@}"; }
187 202
188# 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
189# the last one in the list being the default. 204# the last one in the list being the default.
190get_abi_order() {
191 ewarn "Please update your ebuild to use get_install_abis instead of get_abi_order"
192 get_install_abis ${@}
193}
194
195get_install_abis() { 205get_install_abis() {
196 local order="" 206 local order=""
197 207
198 if [ -z "${MULTILIB_ABIS}" ]; then 208 if [ -z "${MULTILIB_ABIS}" ]; then
199 echo "NOMULTILIB" 209 echo "default"
200 return 1 210 return 0
201 fi 211 fi
202 212
203 if hasq multilib-pkg-force ${RESTRICT} || 213 if hasq multilib-pkg-force ${RESTRICT} ||
204 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then 214 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
205 for x in ${MULTILIB_ABIS}; do 215 for x in ${MULTILIB_ABIS}; do
206 if [ "${x}" != "${DEFAULT_ABI}" ]; then 216 if [ "${x}" != "${DEFAULT_ABI}" ]; then
207 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}" 217 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}"
208 fi 218 fi
234# the last one in the list being the default. 244# the last one in the list being the default.
235get_all_abis() { 245get_all_abis() {
236 local order="" 246 local order=""
237 247
238 if [ -z "${MULTILIB_ABIS}" ]; then 248 if [ -z "${MULTILIB_ABIS}" ]; then
239 echo "NOMULTILIB" 249 echo "default"
240 return 1 250 return 0
241 fi 251 fi
242 252
243 for x in ${MULTILIB_ABIS}; do 253 for x in ${MULTILIB_ABIS}; do
244 if [ "${x}" != "${DEFAULT_ABI}" ]; then 254 if [ "${x}" != "${DEFAULT_ABI}" ]; then
245 order="${order:+${order }}${x}" 255 order="${order:+${order }}${x}"
262 if has_multilib_profile; then 272 if has_multilib_profile; then
263 for abi in ${MULTILIB_ABIS}; do 273 for abi in ${MULTILIB_ABIS}; do
264 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" 274 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
265 done 275 done
266 elif [ -n "${CONF_LIBDIR}" ]; then 276 elif [ -n "${CONF_LIBDIR}" ]; then
267 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:=lib32}; do 277 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:-lib32}; do
268 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}" 278 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}"
269 done 279 done
270 fi 280 fi
271 281
272 echo "${libdirs}" 282 echo "${libdirs}"
274 284
275# 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
276# using the new multilib configuration. This can be used to determine 286# using the new multilib configuration. This can be used to determine
277# 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}
278is_final_abi() { 288is_final_abi() {
279 ! has_multilib_profile && return 0 289 has_multilib_profile || return 0
280 local ALL_ABIS=$(get_abi_order) 290 local ALL_ABIS=$(get_install_abis)
281 local LAST_ABI=${ALL_ABIS/* /} 291 local LAST_ABI=${ALL_ABIS/* /}
282 [ "${LAST_ABI}" = "${ABI}" ] 292 [[ ${LAST_ABI} == ${ABI} ]]
283} 293}
284 294
285# echo the number of ABIs we will be installing for 295# echo the number of ABIs we will be installing for
286number_abis() { 296number_abis() {
287 get_abi_order | wc -w 297 get_install_abis | wc -w
288} 298}
289 299
290# get_ml_incdir [<include dir> [<ABI>]] 300# get_ml_incdir [<include dir> [<ABI>]]
291# include dir defaults to /usr/include 301# include dir defaults to /usr/include
292# ABI defaults to ${ABI} or ${DEFAULT_ABI} 302# ABI defaults to ${ABI} or ${DEFAULT_ABI}
301 if [[ -z "${MULTILIB_ABIS}" ]]; then 311 if [[ -z "${MULTILIB_ABIS}" ]]; then
302 echo ${incdir} 312 echo ${incdir}
303 return 0 313 return 0
304 fi 314 fi
305 315
306 local abi=${ABI:-${DEFAULT_ABI}} 316 local abi=${ABI-${DEFAULT_ABI}}
307 if [[ ${#} -gt 0 ]]; then 317 if [[ ${#} -gt 0 ]]; then
308 abi=${1} 318 abi=${1}
309 shift 319 shift
310 fi 320 fi
311 321
357 popd 367 popd
358 368
359 for dir in ${dirs}; do 369 for dir in ${dirs}; do
360 local args=${dir} 370 local args=${dir}
361 local abi 371 local abi
362 for abi in $(get_abi_order); do 372 for abi in $(get_install_abis); do
363 args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}" 373 args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
364 done 374 done
365 create_ml_includes ${args} 375 create_ml_includes ${args}
366 done 376 done
367 fi 377 fi
389 local file 399 local file
390 for file in $(create_ml_includes-allfiles ${basedirs}); do 400 for file in $(create_ml_includes-allfiles ${basedirs}); do
391 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')"
392 { 402 {
393 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 */"
394 #echo "#ifndef __CREATE_ML_INCLUDES_STUB_${name}__"
395 #echo "#define __CREATE_ML_INCLUDES_STUB_${name}__"
396 #echo ""
397 404
398 local dir 405 local dir
399 for dir in ${basedirs}; do 406 for dir in ${basedirs}; do
400 if [ -f "${D}/${dir}/${file}" ]; then 407 if [ -f "${D}/${dir}/${file}" ]; then
401 echo "#ifdef $(create_ml_includes-sym_for_dir ${dir} ${mlinfo})" 408 local sym=$(create_ml_includes-sym_for_dir ${dir} ${mlinfo})
402 echo "#include \"$(create_ml_includes-relative_between ${dest}/$(dirname ${file}) ${dir}/${file})\"" 409 if [[ ${sym::1} == "!" ]]; then
403 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} */"
404 echo "" 416 echo ""
405 fi 417 fi
406 done 418 done
407 419
408 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" 420 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
409 } > ${D}/${dest}/${file} 421 } > ${D}/${dest}/${file}
410 done 422 done
411} 423}
412 424
413# Helper function for create_ml_includes 425# Helper function for create_ml_includes
414create_ml_includes-relative_between() { 426create_ml_includes-absolute() {
415 local src="$(create_ml_includes-tidy_path ${1})"
416 local dst="$(create_ml_includes-tidy_path ${2})" 427 local dst="$(create_ml_includes-tidy_path ${1})"
417 428
418 src=(${src//\// })
419 dst=(${dst//\// }) 429 dst=(${dst//\// })
420 430
421 local i 431 local i
422 for ((i=0; i<${#src[*]}; i++)); do 432 for ((i=0; i<${#dst[*]}; i++)); do
423 [ "${dst[i]}" != "${src[i]}" ] && break 433 [ "${dst[i]}" == "include" ] && break
424 done 434 done
425 435
426 local common=$i 436 local strip_upto=$i
427 437
428 for ((i=${#src[*]}; i>common; i--)); do
429 echo -n ../
430 done
431
432 for ((i=common; i<${#dst[*]}-1; i++)); do 438 for ((i=strip_upto+1; i<${#dst[*]}-1; i++)); do
433 echo -n ${dst[i]}/ 439 echo -n ${dst[i]}/
434 done 440 done
435 441
436 echo -n ${dst[i]} 442 echo -n ${dst[i]}
437} 443}
463 # Remove trailing .. 469 # Remove trailing ..
464 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*} 470 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*}
465 471
466 # Remove trailing / 472 # Remove trailing /
467 [ "${removed##*/}" = "" ] && removed=${removed%/*} 473 [ "${removed##*/}" = "" ] && removed=${removed%/*}
468 474
469 echo ${removed} 475 echo ${removed}
470 fi 476 fi
471} 477}
472 478
473# Helper function for create_ml_includes 479# Helper function for create_ml_includes
523 done 529 done
524 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} ${@}"
525 # exit because we'll likely be called from a subshell 531 # exit because we'll likely be called from a subshell
526 exit 1 532 exit 1
527} 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.17  
changed lines
  Added in v.1.32

  ViewVC Help
Powered by ViewVC 1.1.20