/[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.20
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.20 2005/02/10 23:13:11 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.
10ECLASS=multilib 10ECLASS=multilib
11INHERITED="$INHERITED $ECLASS" 11INHERITED="$INHERITED $ECLASS"
12 12
13DESCRIPTION="Based on the ${ECLASS} eclass" 13DESCRIPTION="Based on the ${ECLASS} eclass"
14 14
15DEPEND="!build? ( sys-apps/sed sys-apps/findutils sys-apps/coreutils )" 15# has_multilib_profile:
16# Return true if the current profile is a multilib profile and lists more than
17# one abi in ${MULTILIB_ABIS}. You might want to use this like
18# 'use multilib || has_multilib_profile' until all profiles utilizing the
19# 'multilib' use flag are removed from portage
20
21# is_final_abi:
22# Return true if ${ABI} is the final abi to be installed (and thus we are
23# on our last run through a src_* function.
24
25# number_abis:
26# echo the number of ABIs we will be installing for
27
28# get_install_abis:
29# Return a list of the ABIs we want to install for with
30# the last one in the list being the default.
31
32# get_all_abis:
33# Return a list of the ABIs supported by this profile.
34# the last one in the list being the default.
35
36# get_all_libdirs:
37# Returns a list of all the libdirs used by this profile. This includes
38# those that might not be touched by the current ebuild and always includes
39# "lib".
40
41# get_libdir:
42# Returns the libdir for the selected ABI. This is backwards compatible
43# and simply calls get_abi_LIBDIR() on newer profiles. You should use this
44# to determine where to install shared objects (ex: /usr/$(get_libdir))
45
46# get_abi_var <VAR> [<ABI>]:
47# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
48#
49# get_abi_CFLAGS:
50# get_abi_CDEFINE:
51# get_abi_LIBDIR:
52# Aliases for 'get_abi_var CFLAGS', etc.
53
54# get_ml_incdir [<include dir> [<ABI>]]
55# include dir defaults to /usr/include
56# ABI defaults to ${ABI} or ${DEFAULT_ABI}
57#
58# If a multilib include dir is associated with the passed include dir, then
59# we return it, otherwise, we just echo back the include dir. This is
60# neccessary when a built script greps header files rather than testing them
61# via #include (like perl) to figure out features.
62
63# prep_ml_includes:
64# Some includes (include/asm, glibc, etc) are ABI dependent. In this case,
65# We can install them in different locations for each ABI and create a common
66# header which includes the right one based on CDEFINE_${ABI}. If your
67# package installs ABI-specific headers, just add 'prep_ml_includes' to the
68# end of your src_install(). It takes a list of directories that include
69# files are installed in (default is /usr/include if none are passed).
70#
71# Example:
72# src_install() {
73# ...
74# prep_ml_includes /usr/qt/3/include
75# }
76
77# create_ml_includes <include dir> <symbol 1>:<dir 1> [<symbol 2>:<dir 2> ...]
78# If you need more control than prep_ml_includes can offer (like linux-headers
79# for the asm-* dirs, then use create_ml_includes. The firs argument is the
80# common dir. The remaining args are of the form <symbol>:<dir> where
81# <symbol> is what is put in the #ifdef for choosing that dir.
82#
83# Ideas for this code came from debian's sparc-linux headers package.
84#
85# Example:
86# 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
88
89### END DOCUMENTATION ###
90
91# Defaults:
92CFLAGS_default=""
93LDFLAGS_default=""
94CHOST_default="${CHOST}"
95LIBDIR_default="${CONF_LIBDIR:-lib}"
96CDEFINE_default="__unix__"
97
98# has_multilib_profile()
99has_multilib_profile() {
100 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ]
101}
16 102
17# This function simply returns the desired lib directory. With portage 103# This function simply returns the desired lib directory. With portage
18# 2.0.51, we now have support for installing libraries to lib32/lib64 104# 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 105# 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 106# 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, 112# 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 113# 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 114# depend on a newer version of portage (not yet released) which uses these
29# over CONF_LIBDIR in econf, dolib, etc... 115# over CONF_LIBDIR in econf, dolib, etc...
30get_libdir() { 116get_libdir() {
31 LIBDIR_TEST=$(type econf) 117 local CONF_LIBDIR
32 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 118 if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then
33 # if there is an override, we want to use that... always. 119 # if there is an override, we want to use that... always.
34 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 120 echo ${CONF_LIBDIR_OVERRIDE}
35 elif [ -n "$(get_abi_LIBDIR)" ]; then 121 else
36 CONF_LIBDIR="$(get_abi_LIBDIR)" 122 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 123 fi
41 # and of course, default to lib if CONF_LIBDIR isnt set
42 echo ${CONF_LIBDIR:=lib}
43 unset LIBDIR_TEST
44} 124}
45 125
46get_multilibdir() { 126get_multilibdir() {
47 if [ -n "$(get_abi_LIBDIR)" ]; then 127 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" 128 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 129 exit 1
50 fi 130 fi
51 echo ${CONF_MULTILIBDIR:=lib32} 131 echo ${CONF_MULTILIBDIR:=lib32}
52} 132}
61# 141#
62# get_libdir_override lib64 142# get_libdir_override lib64
63# 143#
64# Travis Tilley <lv@gentoo.org> (31 Aug 2004) 144# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
65get_libdir_override() { 145get_libdir_override() {
66 if [ -n "$(get_abi_LIBDIR)" ]; then 146 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" 147 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 148 exit 1
69 fi 149 fi
70 CONF_LIBDIR="$1" 150 CONF_LIBDIR="$1"
71 CONF_LIBDIR_OVERRIDE="$1" 151 CONF_LIBDIR_OVERRIDE="$1"
152 LIBDIR_default="$1"
72} 153}
73 154
74# get_abi_var <VAR> [<ABI>] 155# get_abi_var <VAR> [<ABI>]
75# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults 156# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
76# 157#
93 elif [ -n "${ABI}" ]; then 174 elif [ -n "${ABI}" ]; then
94 abi=${ABI} 175 abi=${ABI}
95 elif [ -n "${DEFAULT_ABI}" ]; then 176 elif [ -n "${DEFAULT_ABI}" ]; then
96 abi=${DEFAULT_ABI} 177 abi=${DEFAULT_ABI}
97 else 178 else
98 return 1 179 abi="default"
99 fi 180 fi
100 181
101 local var="${flag}_${abi}" 182 local var="${flag}_${abi}"
102 echo ${!var} 183 echo ${!var}
103} 184}
104 185
105get_abi_CFLAGS() { get_abi_var CFLAGS ${@}; } 186get_abi_CFLAGS() { get_abi_var CFLAGS "${@}"; }
187get_abi_LDFLAGS() { get_abi_var LDFLAGS "${@}"; }
188get_abi_CHOST() { get_abi_var CHOST "${@}"; }
106get_abi_CDEFINE() { get_abi_var CDEFINE ${@}; } 189get_abi_CDEFINE() { get_abi_var CDEFINE "${@}"; }
107get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; } 190get_abi_LIBDIR() { get_abi_var LIBDIR "${@}"; }
108 191
109# Return a list of the ABIs we want to install for with 192# Return a list of the ABIs we want to install for with
110# the last one in the list being the default. 193# the last one in the list being the default.
111get_abi_order() { 194get_install_abis() {
112 local order="" 195 local order=""
113 196
114 if [ -z "${MULTILIB_ABIS}" ]; then 197 if [ -z "${MULTILIB_ABIS}" ]; then
115 echo "NOMULTILIB" 198 echo "default"
116 return 1 199 return 0
117 fi 200 fi
118 201
119 if hasq multilib-pkg-force ${RESTRICT} || 202 if hasq multilib-pkg-force ${RESTRICT} ||
120 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then 203 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
121 for x in ${MULTILIB_ABIS}; do 204 for x in ${MULTILIB_ABIS}; do
144 227
145 echo ${order} 228 echo ${order}
146 return 0 229 return 0
147} 230}
148 231
232# Return a list of the ABIs supported by this profile.
233# the last one in the list being the default.
234get_all_abis() {
235 local order=""
236
237 if [ -z "${MULTILIB_ABIS}" ]; then
238 echo "default"
239 return 0
240 fi
241
242 for x in ${MULTILIB_ABIS}; do
243 if [ "${x}" != "${DEFAULT_ABI}" ]; then
244 order="${order:+${order }}${x}"
245 fi
246 done
247 order="${order:+${order} }${DEFAULT_ABI}"
248
249 echo ${order}
250 return 0
251}
252
149# get_all_libdir() 253# get_all_libdirs()
150# Returns a list of all the libdirs used by this profile. This includes 254# Returns a list of all the libdirs used by this profile. This includes
151# those that might not be touched by the current ebuild. 255# those that might not be touched by the current ebuild.
152get_all_libdirs() { 256get_all_libdirs() {
153 local libdirs="lib" 257 local libdirs="lib"
154 local abi 258 local abi
155 local dir 259 local dir
156 260
157 if [ -n "${MULTILIB_ABIS}" ]; then 261 if has_multilib_profile; then
158 for abi in ${MULTILIB_ABIS}; do 262 for abi in ${MULTILIB_ABIS}; do
159 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" 263 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
160 done 264 done
161 elif [ -n "${CONF_LIBDIR}" ]; then 265 elif [ -n "${CONF_LIBDIR}" ]; then
162 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:=lib32}; do 266 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:-lib32}; do
163 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}" 267 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}"
164 done 268 done
165 fi 269 fi
166 270
167 echo "${libdirs}" 271 echo "${libdirs}"
169 273
170# Return true if ${ABI} is the last ABI on our list (or if we're not 274# 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 275# 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} 276# if we're in the last (or only) run through src_{unpack,compile,install}
173is_final_abi() { 277is_final_abi() {
174 [ -z "${ABI}" ] && return 0 278 ! has_multilib_profile && return 0
175 local ALL_ABIS=$(get_abi_order) 279 local ALL_ABIS=$(get_install_abis)
176 local LAST_ABI=${ALL_ABIS/* /} 280 local LAST_ABI=${ALL_ABIS/* /}
177 [ "${LAST_ABI}" = "${ABI}" ] 281 [ "${LAST_ABI}" = "${ABI}" ]
178} 282}
179 283
180# echo the number of ABIs we will be installing for 284# echo the number of ABIs we will be installing for
181number_abis() { 285number_abis() {
182 get_abi_order | wc -w 286 get_install_abis | wc -w
287}
288
289# get_ml_incdir [<include dir> [<ABI>]]
290# include dir defaults to /usr/include
291# ABI defaults to ${ABI} or ${DEFAULT_ABI}
292get_ml_incdir() {
293 local dir=/usr/include
294
295 if [[ ${#} -gt 0 ]]; then
296 incdir=${1}
297 shift
298 fi
299
300 if [[ -z "${MULTILIB_ABIS}" ]]; then
301 echo ${incdir}
302 return 0
303 fi
304
305 local abi=${ABI:-${DEFAULT_ABI}}
306 if [[ ${#} -gt 0 ]]; then
307 abi=${1}
308 shift
309 fi
310
311 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then
312 echo ${dir}/gentoo-multilib/${abi}
313 else
314 echo ${dir}
315 fi
183} 316}
184 317
185# prep_ml_includes: 318# prep_ml_includes:
186# 319#
187# Some includes (include/asm, glibc, etc) are ABI dependent. In this case, 320# Some includes (include/asm, glibc, etc) are ABI dependent. In this case,
196# ... 329# ...
197# prep_ml_includes /usr/qt/3/include 330# prep_ml_includes /usr/qt/3/include
198# } 331# }
199 332
200prep_ml_includes() { 333prep_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 334 if [ $(number_abis) -gt 1 ]; then
209 local dir 335 local dir
336 local dirs
337 local base
338
339 if [ ${#} -eq 0 ]; then
340 dirs="/usr/include"
341 else
342 dirs="${@}"
343 fi
344
210 for dir in ${dirs}; do 345 for dir in ${dirs}; do
346 base=${T}/gentoo-multilib/${dir}/gentoo-multilib
347 mkdir -p ${base}
348 [ -d ${base}/${ABI} ] && rm -rf ${base}/${ABI}
211 mv ${D}/${dir} ${D}/${dir}.${ABI} 349 mv ${D}/${dir} ${base}/${ABI}
212 done 350 done
213 351
214 if is_final_abi; then 352 if is_final_abi; then
353 base=${T}/gentoo-multilib
354 pushd ${base}
355 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D}
356 popd
357
215 for dir in ${dirs}; do 358 for dir in ${dirs}; do
216 local args="${dir}" 359 local args=${dir}
217 local abi 360 local abi
218 for abi in $(get_abi_order); do 361 for abi in $(get_install_abis); do
219 args="${args} $(get_abi_CDEFINE ${abi}):${dir}.${abi}" 362 args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
220 done 363 done
221 create_ml_includes ${args} 364 create_ml_includes ${args}
222 done 365 done
223 fi 366 fi
224 fi 367 fi
294 437
295# Helper function for create_ml_includes 438# Helper function for create_ml_includes
296create_ml_includes-tidy_path() { 439create_ml_includes-tidy_path() {
297 local removed="${1}" 440 local removed="${1}"
298 441
299 if [ -n "${1}" ]; then 442 if [ -n "${removed}" ]; then
300 # Remove multiple slashes 443 # Remove multiple slashes
301 while [ "${removed}" != "${removed/\/\//\/}" ]; do 444 while [ "${removed}" != "${removed/\/\//\/}" ]; do
302 removed=${removed/\/\//\/} 445 removed=${removed/\/\//\/}
303 done 446 done
304 447
307 removed=${removed//\/.\//\/} 450 removed=${removed//\/.\//\/}
308 done 451 done
309 [ "${removed##*/}" = "." ] && removed=${removed%/*} 452 [ "${removed##*/}" = "." ] && removed=${removed%/*}
310 453
311 # Removed .. directories 454 # Removed .. directories
312 # I wonder if there's a non-trivial bashism for this one... 455 while [ "${removed}" != "${removed//\/..\/}" ]; do
313 while [ "${removed}" != "$(echo ${removed} | sed -e 's:[^/]*/\.\./::')" ]; do 456 local p1="${removed%%\/..\/*}"
314 removed=$(echo ${removed} | sed -e 's:[^/]*/\.\./::') 457 local p2="${removed#*\/..\/}"
458
459 removed="${p1%\/*}/${p2}"
315 done 460 done
316 461
317 # Remove trailing .. 462 # Remove trailing ..
318 removed=$(echo ${removed} | sed -e 's:/[^/]*/\.\.$::') 463 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*}
319 464
320 # Remove trailing / 465 # Remove trailing /
321 [ "${removed##*/}" = "" ] && removed=${removed%/*} 466 [ "${removed##*/}" = "" ] && removed=${removed%/*}
322 467
323 echo ${removed} 468 echo ${removed}
353 498
354# Helper function for create_ml_includes 499# Helper function for create_ml_includes
355create_ml_includes-allfiles() { 500create_ml_includes-allfiles() {
356 local basedirs=${@} 501 local basedirs=${@}
357 502
358 local files 503 local basedir
359 for basedir in ${basedirs}; do 504 for basedir in ${basedirs}; do
360 local file 505 local file
361 for file in $(find ${D}/${basedir} -type f); do 506 for file in $(find ${D}/${basedir} -type f); do
362 echo ${file/${D}\/${basedir}\//} 507 echo ${file/${D}\/${basedir}\//}
363 done 508 done
373 if [ "${dir}" = "${data/*:/}" ]; then 518 if [ "${dir}" = "${data/*:/}" ]; then
374 echo ${data/:*/} 519 echo ${data/:*/}
375 return 0 520 return 0
376 fi 521 fi
377 done 522 done
378 echo "Should be here -- create_ml_includes-sym_for_dir ${1} ${@}" 523 echo "Shouldn't be here -- create_ml_includes-sym_for_dir ${1} ${@}"
379 # exit because we'll likely be called from a subshell 524 # exit because we'll likely be called from a subshell
380 exit 1 525 exit 1
381} 526}

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.20

  ViewVC Help
Powered by ViewVC 1.1.20