diff options
author | Martin Schlemmer <azarah@gentoo.org> | 2005-04-23 20:17:52 +0000 |
---|---|---|
committer | Martin Schlemmer <azarah@gentoo.org> | 2005-04-23 20:17:52 +0000 |
commit | c228c338a915bbfacfce866fd24c0c32555a3cc2 (patch) | |
tree | a08f7c99b456a441b26f1363a097dfe1e410cd7d /sys-libs | |
parent | add {ftp,http}://ftp.gnu.org/gnu as a gnu mirror (diff) | |
download | historical-c228c338a915bbfacfce866fd24c0c32555a3cc2.tar.gz historical-c228c338a915bbfacfce866fd24c0c32555a3cc2.tar.bz2 historical-c228c338a915bbfacfce866fd24c0c32555a3cc2.zip |
Small fixor in unpack order.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/glibc/Manifest | 8 | ||||
-rw-r--r-- | sys-libs/glibc/glibc-2.3.5.20050421.ebuild | 17 |
2 files changed, 16 insertions, 9 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 9c073478c77c..519e5e027fa3 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -14,7 +14,7 @@ MD5 16dc0ffd761bd9d50fbadb24b779077a glibc-2.3.3.20040420-r2.ebuild 21650 MD5 a0995009b18b61b6626de84e7ae4ee04 glibc-2.3.4.20040619-r2.ebuild 21195 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 MD5 0e9ad10193c69245b02190235506e3a4 glibc-2.2.5-r9.ebuild 10894 -MD5 0fdbdb5677088c2b1b6c58eafa946ae5 glibc-2.3.5.20050421.ebuild 39035 +MD5 f94859cbac59d7308f1316f1f0029d0d glibc-2.3.5.20050421.ebuild 39330 MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158 MD5 bedcd868a9462009158714238594173c files/nscd 964 MD5 184eddb92615fb991dce41b9edbfa690 files/glibc-manpages-2.3.2.tar.bz2 14700 @@ -152,7 +152,7 @@ MD5 84fa9a725c22975d735a2f91543a5cca files/2.3.3/glibc-2.3.3-mips-sysify.diff 21 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFCaoqP1ZcsMnZjRyIRAoPMAJwMBEs7ui3na1qZDIKe+hQzR+VOugCcDl+P -c5JvbcJpF6B8usZ1KdIL8QI= -=bMsE +iD8DBQFCaq6A1ZcsMnZjRyIRAuSYAKC1PG6YtMCTS8ryZpn5RHR3TUmtDgCeLHOB +TCFarIhrEYqrC6D2SK+w02s= +=AGPr -----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/glibc-2.3.5.20050421.ebuild b/sys-libs/glibc/glibc-2.3.5.20050421.ebuild index 67d74752d67c..981acabee159 100644 --- a/sys-libs/glibc/glibc-2.3.5.20050421.ebuild +++ b/sys-libs/glibc/glibc-2.3.5.20050421.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050421.ebuild,v 1.1 2005/04/23 17:44:31 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050421.ebuild,v 1.2 2005/04/23 20:17:52 azarah Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -192,10 +192,11 @@ toolchain-glibc_src_unpack() { unpack ${PN}-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 fi - if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - cd ${S} - unpack ${PN}-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 - fi +# FIXME: I updated the infopages, but forgot to regen th branch-update +# if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then +# cd ${S} +# unpack ${PN}-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 +# fi if [[ -n ${BRANCH_UPDATE} ]] ; then cd ${WORKDIR} @@ -212,6 +213,12 @@ toolchain-glibc_src_unpack() { sed -i -e "s:\(#define RELEASE\).*:\1 \"${BRANCH_UPDATE}\":" version.h fi +# FIXME: I updated the infopages, but forgot to regen th branch-update + if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then + cd ${S} + unpack ${PN}-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 + fi + if [[ -n ${PATCH_VER} ]] ; then EPATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE}" EPATCH_SUFFIX="patch" |