Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 38714 Details for
Bug 61856
sys-lib/glibc-2.3.3.20040420-r1 fails to complete a stage1 install
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
glibc-pkg_setup.diff
glibc-pkg_setup.diff (text/plain), 3.32 KB, created by
solar (RETIRED)
on 2004-09-01 15:58:13 UTC
(
hide
)
Description:
glibc-pkg_setup.diff
Filename:
MIME Type:
Creator:
solar (RETIRED)
Created:
2004-09-01 15:58:13 UTC
Size:
3.32 KB
patch
obsolete
>Index: glibc-2.3.3.20040420-r1.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3.20040420-r1.ebuild,v >retrieving revision 1.5 >diff -u -b -B -w -p -u -r1.5 glibc-2.3.3.20040420-r1.ebuild >--- glibc-2.3.3.20040420-r1.ebuild 31 Aug 2004 18:46:17 -0000 1.5 >+++ glibc-2.3.3.20040420-r1.ebuild 1 Sep 2004 22:53:52 -0000 >@@ -133,28 +133,29 @@ use_nptl() { > return 1 > } > >-pkg_setup() { >+glibc_setup() { > # Check if we are going to downgrade, we don't like that >- local old_version >- >- old_version="`best_version glibc`" >- old_version="${old_version/sys-libs\/glibc-/}" >- >- if [ "$old_version" ]; then >- if [ `python -c "import portage; print int(portage.vercmp(\"${PV}\",\"$old_version\"))"` -lt 0 ]; then >- if [ "${FORCE_DOWNGRADE}" ]; then >- ewarn "downgrading glibc, still not recommended, but we'll do as you wish" >- else >- eerror "Downgrading glibc is not supported and we strongly recommend that" >- eerror "you don't do it as it WILL break all applications compiled against" >- eerror "the new version (most likely including python and portage)." >- eerror "If you are REALLY sure that you want to do it set " >- eerror " FORCE_DOWNGRADE=1" >- eerror "when you try it again." >- die "glibc downgrade" >- fi >- fi >- fi >+ #local old_version >+ # >+ #old_version="`best_version glibc`" >+ #old_version="${old_version/sys-libs\/glibc-/}" >+ # >+ #if [ "$old_version" ]; then >+ # The vercmp fails if this ebuild is -r[0-9..] Please fix. >+ # if [ `python -c "import portage; print int(portage.vercmp(\"${PV}\",\"$old_version\"))"` -lt 0 ]; then >+ # if [ "${FORCE_DOWNGRADE}" ]; then >+ # ewarn "downgrading glibc, still not recommended, but we'll do as you wish" >+ # else >+ # eerror "Downgrading glibc is not supported and we strongly recommend that" >+ # eerror "you don't do it as it WILL break all applications compiled against" >+ # eerror "the new version (most likely including python and portage)." >+ # eerror "If you are REALLY sure that you want to do it set " >+ # eerror " FORCE_DOWNGRADE=1" >+ # eerror "when you try it again." >+ # die "glibc downgrade" >+ # fi >+ # fi >+ #fi > > # We need gcc 3.2 or later ... > if [ "`gcc-major-version`" -ne "3" -o "`gcc-minor-version`" -lt "2" ] >@@ -246,6 +247,9 @@ src_unpack() { > > local LOCAL_P="${PN}-${MY_PV}" > >+ # we only need to check this one time. Bug #61856 >+ glibc_setup >+ > unpack glibc-${MY_PV}.tar.bz2 > > # Extract pre-made man pages. Otherwise we need perl, which is a no-no. >Index: glibc-2.3.4.20040619-r1.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040619-r1.ebuild,v >retrieving revision 1.13 >diff -u -b -B -w -p -u -r1.13 glibc-2.3.4.20040619-r1.ebuild >--- glibc-2.3.4.20040619-r1.ebuild 28 Aug 2004 04:01:18 -0000 1.13 >+++ glibc-2.3.4.20040619-r1.ebuild 1 Sep 2004 22:53:54 -0000 >@@ -273,7 +273,7 @@ setup_locales() { > } > > >-pkg_setup() { >+glibc_setup() { > # genone this block of code breaks things. > # Check if we are going to downgrade, we don't like that > #local old_version >@@ -476,6 +476,10 @@ do_ssp_patches() { > > > src_unpack() { >+ >+ # we only need to check this one time. Bug #61856 >+ glibc_setup >+ > # Check NPTL support _before_ we unpack things to save some time > want_nptl && check_nptl_support >
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 61856
:
38300
|
38491
|
38492
|
38493
|
38518
|
38519
| 38714