/[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.28
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.28 2005/07/06 20:20:04 agriffis 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" 10INHERITED="$INHERITED $ECLASS"
12 11
13DESCRIPTION="Based on the ${ECLASS} eclass" 12DESCRIPTION="Based on the ${ECLASS} eclass"
14 13
15# has_multilib_profile: 14# has_multilib_profile:
86# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64 85# 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 86# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
88 87
89### END DOCUMENTATION ### 88### END DOCUMENTATION ###
90 89
90# Defaults:
91export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"}
92export DEFAULT_ABI=${DEFAULT_ABI:-"default"}
93# This causes econf to set --libdir=/usr/lib where it didn't before
94#export ABI=${ABI:-"default"}
95export CFLAGS_default
96export LDFLAGS_default
97export CHOST_default=${CHOST_default:-${CHOST}}
98export LIBDIR_default=${CONF_LIBDIR:-"lib"}
99export CDEFINE_default="__unix__"
100
91# has_multilib_profile() 101# has_multilib_profile()
92has_multilib_profile() { 102has_multilib_profile() {
93 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ] 103 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ]
94} 104}
95 105
105# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set, 115# 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 116# 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 117# depend on a newer version of portage (not yet released) which uses these
108# over CONF_LIBDIR in econf, dolib, etc... 118# over CONF_LIBDIR in econf, dolib, etc...
109get_libdir() { 119get_libdir() {
110 LIBDIR_TEST=$(type econf) 120 local CONF_LIBDIR
111 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 121 if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then
112 # if there is an override, we want to use that... always. 122 # if there is an override, we want to use that... always.
113 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 123 echo ${CONF_LIBDIR_OVERRIDE}
114 elif [ -n "$(get_abi_LIBDIR)" ]; then 124 else
115 CONF_LIBDIR="$(get_abi_LIBDIR)" 125 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 126 fi
120 # and of course, default to lib if CONF_LIBDIR isnt set
121 echo ${CONF_LIBDIR:=lib}
122 unset LIBDIR_TEST
123} 127}
124 128
125get_multilibdir() { 129get_multilibdir() {
126 if [ -n "$(get_abi_LIBDIR)" ]; then 130 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" 131 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 132 exit 1
129 fi 133 fi
130 echo ${CONF_MULTILIBDIR:=lib32} 134 echo ${CONF_MULTILIBDIR:=lib32}
131} 135}
140# 144#
141# get_libdir_override lib64 145# get_libdir_override lib64
142# 146#
143# Travis Tilley <lv@gentoo.org> (31 Aug 2004) 147# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
144get_libdir_override() { 148get_libdir_override() {
145 if [ -n "$(get_abi_LIBDIR)" ]; then 149 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" 150 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 151 exit 1
148 fi 152 fi
149 CONF_LIBDIR="$1" 153 CONF_LIBDIR="$1"
150 CONF_LIBDIR_OVERRIDE="$1" 154 CONF_LIBDIR_OVERRIDE="$1"
155 LIBDIR_default="$1"
151} 156}
152 157
153# get_abi_var <VAR> [<ABI>] 158# get_abi_var <VAR> [<ABI>]
154# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults 159# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
155# 160#
172 elif [ -n "${ABI}" ]; then 177 elif [ -n "${ABI}" ]; then
173 abi=${ABI} 178 abi=${ABI}
174 elif [ -n "${DEFAULT_ABI}" ]; then 179 elif [ -n "${DEFAULT_ABI}" ]; then
175 abi=${DEFAULT_ABI} 180 abi=${DEFAULT_ABI}
176 else 181 else
177 return 1 182 abi="default"
178 fi 183 fi
179 184
180 local var="${flag}_${abi}" 185 local var="${flag}_${abi}"
181 echo ${!var} 186 echo ${!var}
182} 187}
183 188
184get_abi_CFLAGS() { get_abi_var CFLAGS ${@}; } 189get_abi_CFLAGS() { get_abi_var CFLAGS "${@}"; }
190get_abi_LDFLAGS() { get_abi_var LDFLAGS "${@}"; }
191get_abi_CHOST() { get_abi_var CHOST "${@}"; }
192get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "${@}"; }
185get_abi_CDEFINE() { get_abi_var CDEFINE ${@}; } 193get_abi_CDEFINE() { get_abi_var CDEFINE "${@}"; }
186get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; } 194get_abi_LIBDIR() { get_abi_var LIBDIR "${@}"; }
187 195
188# Return a list of the ABIs we want to install for with 196# Return a list of the ABIs we want to install for with
189# the last one in the list being the default. 197# 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() { 198get_install_abis() {
196 local order="" 199 local order=""
197 200
198 if [ -z "${MULTILIB_ABIS}" ]; then 201 if [ -z "${MULTILIB_ABIS}" ]; then
199 echo "NOMULTILIB" 202 echo "default"
200 return 1 203 return 0
201 fi 204 fi
202 205
203 if hasq multilib-pkg-force ${RESTRICT} || 206 if hasq multilib-pkg-force ${RESTRICT} ||
204 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then 207 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
205 for x in ${MULTILIB_ABIS}; do 208 for x in ${MULTILIB_ABIS}; do
234# the last one in the list being the default. 237# the last one in the list being the default.
235get_all_abis() { 238get_all_abis() {
236 local order="" 239 local order=""
237 240
238 if [ -z "${MULTILIB_ABIS}" ]; then 241 if [ -z "${MULTILIB_ABIS}" ]; then
239 echo "NOMULTILIB" 242 echo "default"
240 return 1 243 return 0
241 fi 244 fi
242 245
243 for x in ${MULTILIB_ABIS}; do 246 for x in ${MULTILIB_ABIS}; do
244 if [ "${x}" != "${DEFAULT_ABI}" ]; then 247 if [ "${x}" != "${DEFAULT_ABI}" ]; then
245 order="${order:+${order }}${x}" 248 order="${order:+${order }}${x}"
262 if has_multilib_profile; then 265 if has_multilib_profile; then
263 for abi in ${MULTILIB_ABIS}; do 266 for abi in ${MULTILIB_ABIS}; do
264 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" 267 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
265 done 268 done
266 elif [ -n "${CONF_LIBDIR}" ]; then 269 elif [ -n "${CONF_LIBDIR}" ]; then
267 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:=lib32}; do 270 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:-lib32}; do
268 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}" 271 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}"
269 done 272 done
270 fi 273 fi
271 274
272 echo "${libdirs}" 275 echo "${libdirs}"
274 277
275# Return true if ${ABI} is the last ABI on our list (or if we're not 278# 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 279# 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} 280# if we're in the last (or only) run through src_{unpack,compile,install}
278is_final_abi() { 281is_final_abi() {
279 ! has_multilib_profile && return 0 282 has_multilib_profile || return 0
280 local ALL_ABIS=$(get_abi_order) 283 local ALL_ABIS=$(get_install_abis)
281 local LAST_ABI=${ALL_ABIS/* /} 284 local LAST_ABI=${ALL_ABIS/* /}
282 [ "${LAST_ABI}" = "${ABI}" ] 285 [[ ${LAST_ABI} == ${ABI} ]]
283} 286}
284 287
285# echo the number of ABIs we will be installing for 288# echo the number of ABIs we will be installing for
286number_abis() { 289number_abis() {
287 get_abi_order | wc -w 290 get_install_abis | wc -w
288} 291}
289 292
290# get_ml_incdir [<include dir> [<ABI>]] 293# get_ml_incdir [<include dir> [<ABI>]]
291# include dir defaults to /usr/include 294# include dir defaults to /usr/include
292# ABI defaults to ${ABI} or ${DEFAULT_ABI} 295# ABI defaults to ${ABI} or ${DEFAULT_ABI}
301 if [[ -z "${MULTILIB_ABIS}" ]]; then 304 if [[ -z "${MULTILIB_ABIS}" ]]; then
302 echo ${incdir} 305 echo ${incdir}
303 return 0 306 return 0
304 fi 307 fi
305 308
306 local abi=${ABI:-${DEFAULT_ABI}} 309 local abi=${ABI-${DEFAULT_ABI}}
307 if [[ ${#} -gt 0 ]]; then 310 if [[ ${#} -gt 0 ]]; then
308 abi=${1} 311 abi=${1}
309 shift 312 shift
310 fi 313 fi
311 314
357 popd 360 popd
358 361
359 for dir in ${dirs}; do 362 for dir in ${dirs}; do
360 local args=${dir} 363 local args=${dir}
361 local abi 364 local abi
362 for abi in $(get_abi_order); do 365 for abi in $(get_install_abis); do
363 args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}" 366 args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
364 done 367 done
365 create_ml_includes ${args} 368 create_ml_includes ${args}
366 done 369 done
367 fi 370 fi
389 local file 392 local file
390 for file in $(create_ml_includes-allfiles ${basedirs}); do 393 for file in $(create_ml_includes-allfiles ${basedirs}); do
391 local name="$(echo $file | tr a-z A-Z | sed 's:[^A-Z]:_:g')" 394 local name="$(echo $file | tr a-z A-Z | sed 's:[^A-Z]:_:g')"
392 { 395 {
393 echo "/* Common header file autogenerated by create_ml_includes in multilib.eclass */" 396 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 397
398 local dir 398 local dir
399 for dir in ${basedirs}; do 399 for dir in ${basedirs}; do
400 if [ -f "${D}/${dir}/${file}" ]; then 400 if [ -f "${D}/${dir}/${file}" ]; then
401 echo "#ifdef $(create_ml_includes-sym_for_dir ${dir} ${mlinfo})" 401 local sym=$(create_ml_includes-sym_for_dir ${dir} ${mlinfo})
402 echo "#include \"$(create_ml_includes-relative_between ${dest}/$(dirname ${file}) ${dir}/${file})\"" 402 if [[ ${sym::1} == "!" ]]; then
403 echo "#endif /* $(create_ml_includes-sym_for_dir ${dir} ${mlinfo}) */" 403 echo "#ifndef ${sym:1}"
404 else
405 echo "#ifdef ${sym}"
406 fi
407 echo "#include <$(create_ml_includes-absolute ${dir}/${file})>"
408 echo "#endif /* ${sym} */"
404 echo "" 409 echo ""
405 fi 410 fi
406 done 411 done
407 412
408 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" 413 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
409 } > ${D}/${dest}/${file} 414 } > ${D}/${dest}/${file}
410 done 415 done
411} 416}
412 417
413# Helper function for create_ml_includes 418# Helper function for create_ml_includes
414create_ml_includes-relative_between() { 419create_ml_includes-absolute() {
415 local src="$(create_ml_includes-tidy_path ${1})"
416 local dst="$(create_ml_includes-tidy_path ${2})" 420 local dst="$(create_ml_includes-tidy_path ${1})"
417 421
418 src=(${src//\// })
419 dst=(${dst//\// }) 422 dst=(${dst//\// })
420 423
421 local i 424 local i
422 for ((i=0; i<${#src[*]}; i++)); do 425 for ((i=0; i<${#dst[*]}; i++)); do
423 [ "${dst[i]}" != "${src[i]}" ] && break 426 [ "${dst[i]}" == "include" ] && break
424 done 427 done
425 428
426 local common=$i 429 local strip_upto=$i
427 430
428 for ((i=${#src[*]}; i>common; i--)); do
429 echo -n ../
430 done
431
432 for ((i=common; i<${#dst[*]}-1; i++)); do 431 for ((i=strip_upto+1; i<${#dst[*]}-1; i++)); do
433 echo -n ${dst[i]}/ 432 echo -n ${dst[i]}/
434 done 433 done
435 434
436 echo -n ${dst[i]} 435 echo -n ${dst[i]}
437} 436}

Legend:
Removed from v.1.17  
changed lines
  Added in v.1.28

  ViewVC Help
Powered by ViewVC 1.1.20