Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 47272 Details for
Bug 75420
[TRACKER] eradicator's massive multilib bug
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
updated libdir patch for current portage/bin
libdir-portage.patch (text/plain), 2.10 KB, created by
Jeremy Huddleston (RETIRED)
on 2004-12-31 03:15:06 UTC
(
hide
)
Description:
updated libdir patch for current portage/bin
Filename:
MIME Type:
Creator:
Jeremy Huddleston (RETIRED)
Created:
2004-12-31 03:15:06 UTC
Size:
2.10 KB
patch
obsolete
>Index: dolib >=================================================================== >RCS file: /var/cvsroot/gentoo-src/portage/bin/dolib,v >retrieving revision 1.8 >diff -u -1 -b -p -r1.8 dolib >--- dolib 10 Oct 2004 10:07:20 -0000 1.8 >+++ dolib 31 Dec 2004 11:13:26 -0000 >@@ -5,2 +5,8 @@ > >+LIBDIR_VAR="LIBDIR_${ABI}" >+if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then >+ CONF_LIBDIR="${!LIBDIR_VAR}" >+fi >+unset LIBDIR_VAR >+ > if [ -z "${CONF_LIBDIR}" ]; then >Index: ebuild-functions.sh >=================================================================== >RCS file: /var/cvsroot/gentoo-src/portage/bin/ebuild-functions.sh,v >retrieving revision 1.4 >diff -u -1 -b -p -r1.4 ebuild-functions.sh >--- ebuild-functions.sh 9 Dec 2004 17:10:27 -0000 1.4 >+++ ebuild-functions.sh 31 Dec 2004 11:13:26 -0000 >@@ -90,3 +90,8 @@ econf() { > # if the ebuild passes in --libdir, they're responsible for the conf_libdir fun. >- if [ ! -z "${CONF_LIBDIR}" ] && [ "${*/--libdir}" == "$*" ]; then >+ LIBDIR_VAR="LIBDIR_${ABI}" >+ if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then >+ CONF_LIBDIR="${!LIBDIR_VAR}" >+ fi >+ unset LIBDIR_VAR >+ if [ -n "${CONF_LIBDIR}" ] && [ "${*/--libdir}" == "$*" ]; then > if [ "${*/--prefix}" == "$*" ]; then >@@ -140,3 +145,8 @@ einstall() > # CONF_PREFIX is only set if they didn't pass in libdir above >- if [ ! -z "${CONF_LIBDIR}" ] && [ "${CONF_PREFIX:-unset}" != "unset" ]; then >+ LIBDIR_VAR="LIBDIR_${ABI}" >+ if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then >+ CONF_LIBDIR="${!LIBDIR_VAR}" >+ fi >+ unset LIBDIR_VAR >+ if [ -n "${CONF_LIBDIR}" ] && [ "${CONF_PREFIX:-unset}" != "unset" ]; then > EXTRA_EINSTALL="libdir=${D}/${CONF_PREFIX}/${CONF_LIBDIR} ${EXTRA_EINSTALL}" >Index: preplib >=================================================================== >RCS file: /var/cvsroot/gentoo-src/portage/bin/preplib,v >retrieving revision 1.7 >diff -u -1 -b -p -r1.7 preplib >--- preplib 4 Oct 2004 13:56:50 -0000 1.7 >+++ preplib 31 Dec 2004 11:13:26 -0000 >@@ -5,2 +5,8 @@ > >+LIBDIR_VAR="LIBDIR_${ABI}" >+if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then >+ CONF_LIBDIR="${!LIBDIR_VAR}" >+fi >+unset LIBDIR_VAR >+ > if [ -z "${CONF_LIBDIR}" ]; then
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 75420
:
46698
|
46769
|
46850
|
47272
|
47436
|
47440
|
47558
|
47684
|
47826
|
48489
|
49143