Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 82955 Details for
Bug 118815
portage should install ABI-specific /usr/bin/*-config scripts
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
multilib-wrappers.patch
multilib-wrappers.patch (text/plain), 2.60 KB, created by
Simon Stelling (RETIRED)
on 2006-03-23 12:11:37 UTC
(
hide
)
Description:
multilib-wrappers.patch
Filename:
MIME Type:
Creator:
Simon Stelling (RETIRED)
Created:
2006-03-23 12:11:37 UTC
Size:
2.60 KB
patch
obsolete
>Index: pym/portage.py >=================================================================== >--- pym/portage.py (revision 2982) >+++ pym/portage.py (working copy) >@@ -2356,7 +2356,7 @@ > phase_retval = spawn(actionmap[mydo]["cmd"] % mydo, mysettings, debug=debug, logfile=logfile, **kwargs) > if phase_retval == os.EX_OK: > if mydo == "install": >- mycommand = " ".join([MISC_SH_BINARY, "install_qa_check"]) >+ mycommand = " ".join([MISC_SH_BINARY, "install_qa_check", "install_multilib_wrappers"]) > qa_retval = spawn(mycommand, mysettings, debug=debug, logfile=logfile, **kwargs) > if qa_retval: > writemsg("!!! install_qa_check failed; exiting.\n") >Index: bin/misc-functions.sh >=================================================================== >--- bin/misc-functions.sh (revision 2982) >+++ bin/misc-functions.sh (working copy) >@@ -16,6 +16,32 @@ > shift $# > source /usr/lib/portage/bin/ebuild.sh > >+install_multilib_wrappers() { >+ # Only needed on multilib profiles >+ [[ "${MULTILIB_ABIS/ }" != "${MULTILIB_ABIS}" ]] || return >+ >+ MULTILIB_WRAPPER_MASK="${MULTILIB_WRAPPER_MASK:-*-config}" >+ save_IFS >+ IFS=":" >+ for mypath in ${PATH} ; do >+ restore_IFS >+ if [[ -d ${D}/${mypath} ]] ; then >+ dowrap=$(find ${D}${mypath} -type f -name "${MULTILIB_WRAPPER_MASK}" | sed -e "s:${D}/::" | \ >+ gawk ' >+ BEGIN { split("'"${MULTILIB_WRAPPER_IGNORE}"'", ignore); } >+ { for (idx in ignore) >+ if ($NF ~ "^"ignore[idx]"$") >+ next; >+ print; >+ }') >+ for file in ${dowrap} ; do >+ mv -f ${file} ${file}-${ABI} >+ ln -s /usr/lib/portage/bin/abi-wrapper-config ${file} >+ done >+ fi >+ done >+} >+ > install_qa_check() { > > prepall >Index: bin/abi-wrapper-config >=================================================================== >--- bin/abi-wrapper-config (revision 0) >+++ bin/abi-wrapper-config (revision 0) >@@ -0,0 +1,24 @@ >+#!/bin/bash >+# ${PN}-config is a link to this abi-wrapper on multilib-systems to >+# assure options like --libs return the correct ABI-specific values. >+# This must match the multilib-behaviour of the set profile! >+ >+if [[ -n ${ABI} ]] ; then >+ abi=${ABI} >+elif [[ -n ${DEFAULT_ABI} ]] ; then >+ abi=${DEFAULT_ABI} >+else >+ # we're called from outside portage, so try default first >+ abis=$(portageq envvar DEFAULT_ABI MULTILIB_ABIS) >+ for abi in ${abis} ; do >+ [[ -f ${0}-${abi} ]] && break >+ unset abi >+ done >+fi >+ >+if [[ -f ${0}-${abi} ]] ; then >+ exec ${0}-${abi} ${@} >+else >+ echo "${0}: abi-wrapper-config couldn't find script for current abi" >&2 >+ exit 1 >+fi > >Property changes on: bin/abi-wrapper-config >___________________________________________________________________ >Name: svn:executable > + * >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 118815
:
77151
|
77152
|
77154
|
77534
|
77535
|
77537
|
78799
|
78800
|
78858
|
78859
|
81990
|
82310
| 82955