diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-05-23 22:52:37 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-05-23 22:52:37 +0000 |
| commit | f2fb441440c2b54b29d00a2ba83f9bb2465157f6 (patch) | |
| tree | 209e849abc7314f18890505dc2ce158a0f5341f7 /sys-libs | |
| parent | Stable on x86, bug #164239. (diff) | |
| download | gentoo-2-f2fb441440c2b54b29d00a2ba83f9bb2465157f6.tar.gz gentoo-2-f2fb441440c2b54b29d00a2ba83f9bb2465157f6.tar.bz2 gentoo-2-f2fb441440c2b54b29d00a2ba83f9bb2465157f6.zip | |
add support for glibc-ports
(Portage version: 2.1.2.7)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/files/digest-glibc-2.6 | 9 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.6.ebuild | 23 |
2 files changed, 20 insertions, 12 deletions
diff --git a/sys-libs/glibc/files/digest-glibc-2.6 b/sys-libs/glibc/files/digest-glibc-2.6 index d089cb13fdac..e47935612ddb 100644 --- a/sys-libs/glibc/files/digest-glibc-2.6 +++ b/sys-libs/glibc/files/digest-glibc-2.6 @@ -1,9 +1,12 @@ -MD5 7583065c0f45727e0ac60c31bf784efb glibc-2.6-patches-1.0.tar.bz2 79487 -RMD160 b34d4898a4bff0257926656e7a68e3b420eddcb6 glibc-2.6-patches-1.0.tar.bz2 79487 -SHA256 ed44292212f65c9fe573fae9089d530a2c6ea0b1f7842f16dceff757fb93eec4 glibc-2.6-patches-1.0.tar.bz2 79487 +MD5 f9bb53ad1473db626e6ee81d65a8e6b2 glibc-2.6-patches-1.1.tar.bz2 83925 +RMD160 f582d9ed2aba7d3f292d5f7e64ebf487af9ceac6 glibc-2.6-patches-1.1.tar.bz2 83925 +SHA256 8b9f7c5d2bf79e988277f37a220bfccdfb8f7b092cc56ba490b571b7c777ec45 glibc-2.6-patches-1.1.tar.bz2 83925 MD5 0f471d7cb29dd07786082ad23f787949 glibc-2.6.tar.bz2 15637436 RMD160 9f201f54d41941df299ab88722f4095dd417a5e4 glibc-2.6.tar.bz2 15637436 SHA256 f773ae5762c193091df46244ce355e38d358e8f8be088be0dbf934a193063bba glibc-2.6.tar.bz2 15637436 MD5 ed20ad629986c2746c77cda46fb0602c glibc-libidn-2.6.tar.bz2 101974 RMD160 f4ee5fff7ff2c500c08e47390b88f77898314cf4 glibc-libidn-2.6.tar.bz2 101974 SHA256 25adf6cf0de727bf02978192baddf8cbc77adfbacf15e1428163fbeb267b1862 glibc-libidn-2.6.tar.bz2 101974 +MD5 4b2b2b4a445b12d4ab9ef709b3fe267f glibc-ports-2.6.tar.bz2 431332 +RMD160 275a10d95b5fa34a7c37469468eddbca928fa225 glibc-ports-2.6.tar.bz2 431332 +SHA256 398f56ad651939110ad6af88fdd3e92b5cb0583e6f612f2f12ba0134a22b1fac glibc-ports-2.6.tar.bz2 431332 diff --git a/sys-libs/glibc/glibc-2.6.ebuild b/sys-libs/glibc/glibc-2.6.ebuild index 50732fbdb440..8761f42b2f83 100644 --- a/sys-libs/glibc/glibc-2.6.ebuild +++ b/sys-libs/glibc/glibc-2.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.6.ebuild,v 1.1 2007/05/19 07:26:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.6.ebuild,v 1.2 2007/05/23 22:52:37 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -16,7 +16,7 @@ # CHOST = CTARGET - install into / # CHOST != CTARGET - install into /usr/CTARGET/ -KEYWORDS="" #~alpha ~amd64 -arm -hppa ~ia64 -mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="" #DO NOT KEYWORD; WAIT FOR 2.6.1 ~alpha ~amd64 ~arm -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" BRANCH_UPDATE="" @@ -27,7 +27,7 @@ GLIBC_MANPAGE_VERSION="none" GLIBC_INFOPAGE_VERSION="none" # Gentoo patchset -PATCH_VER="1.0" +PATCH_VER="1.1" GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo" GENTOO_TOOLCHAIN_DEV_URI="http://dev.gentoo.org/~azarah/glibc/XXX http://dev.gentoo.org/~vapier/dist/XXX" @@ -64,7 +64,7 @@ GLIBC_RELEASE_VER=$(get_version_component_range 1-3) # Don't set this to :-, - allows BRANCH_UPDATE="" BRANCH_UPDATE=${BRANCH_UPDATE-$(get_version_component_range 4)} GLIBC_PORTS_VER=${GLIBC_RELEASE_VER} -#GLIBC_LT_VER=${GLIBC_RELEASE_VER} +GLIBC_LT_VER="" # (Recent snapshots fails with 2.6.5 and earlier with NPTL) NPTL_KERNEL_VERSION=${NPTL_KERNEL_VERSION:-"2.6.9"} @@ -117,8 +117,12 @@ get_glibc_src_uri() { GLIBC_SRC_URI="mirror://gnu/glibc/glibc-${GLIBC_RELEASE_VER}.tar.bz2 mirror://gnu/glibc/glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2" - # mirror://gnu/glibc/glibc-ports-${GLIBC_PORTS_VER}.tar.bz2 - # ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-${GLIBC_PORTS_VER}.tar.bz2 + + if [[ -n ${GLIBC_PORTS_VER} ]] ; then + GLIBC_SRC_URI="${GLIBC_SRC_URI} + mirror://gnu/glibc/glibc-ports-${GLIBC_PORTS_VER}.tar.bz2 + ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-${GLIBC_PORTS_VER}.tar.bz2" + fi if [[ -n ${BRANCH_UPDATE} ]] ; then GLIBC_SRC_URI="${GLIBC_SRC_URI} @@ -170,8 +174,8 @@ toolchain-glibc_src_unpack() { cd "${S}" [[ -n ${GLIBC_LT_VER} ]] && unpack glibc-linuxthreads-${GLIBC_LT_VER}.tar.bz2 + [[ -n ${GLIBC_PORTS_VER} ]] && unpack_addon ports ${GLIBC_PORTS_VER} unpack_addon libidn - #unpack_addon ports ${GLIBC_PORTS_VER} if [[ -n ${PATCH_VER} ]] ; then cd "${WORKDIR}" @@ -277,9 +281,10 @@ toolchain-glibc_headers_compile() { cd "${GBUILDDIR}" # Pick out the correct location for build headers - local myconf="--disable-sanity-checks --enable-hacker-mode" + local ports="" myconf="--disable-sanity-checks --enable-hacker-mode" + [[ -n ${GLIBC_PORTS_VER} ]] && ports=",ports" myconf="${myconf} - --enable-add-ons=nptl,ports + --enable-add-ons=nptl${ports} --without-cvs --enable-bind-now --build=${CBUILD_OPT:-${CBUILD}} |