diff options
| -rw-r--r-- | sys-libs/glibc/Manifest | 14 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.4-r2.ebuild | 40 |
2 files changed, 30 insertions, 24 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 59dfc6a9404b..a7df60a6459c 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -548,10 +548,10 @@ EBUILD glibc-2.4-r1.ebuild 42520 RMD160 6d415e820c41377d4ba87f2f863b2fa8c5ae832f MD5 8ac989868b7b6924964020838212c914 glibc-2.4-r1.ebuild 42520 RMD160 6d415e820c41377d4ba87f2f863b2fa8c5ae832f glibc-2.4-r1.ebuild 42520 SHA256 068f139a387f74eb44b364e1057ce7dca634938d00d2493f48473d7a350feebc glibc-2.4-r1.ebuild 42520 -EBUILD glibc-2.4-r2.ebuild 37871 RMD160 a8f247fd51da3b2ae83cb660fe16f18ef5e1fc82 SHA1 74fef1b90b223c3e43ec91d6358430ec6325fc67 SHA256 f1837169fff8062c14d6084e73ff1c506fefa321dc96d443cd50ca578b856792 size 37871 -MD5 807018f85acd46ab95a6ab7551a2af86 glibc-2.4-r2.ebuild 37871 -RMD160 a8f247fd51da3b2ae83cb660fe16f18ef5e1fc82 glibc-2.4-r2.ebuild 37871 -SHA256 f1837169fff8062c14d6084e73ff1c506fefa321dc96d443cd50ca578b856792 glibc-2.4-r2.ebuild 37871 +EBUILD glibc-2.4-r2.ebuild 38006 RMD160 996ab94a24186baae21fd1fcb60e6e71d575821c SHA1 2e090a63b45a82d8193a932a28805a895af87443 SHA256 9b583904115df6d8be76fba1f05d5b40597abc4ec383ab48ac21300d1ff9da7a size 38006 +MD5 bfa9db64dfe300cbf0a5e757f7da27ed glibc-2.4-r2.ebuild 38006 +RMD160 996ab94a24186baae21fd1fcb60e6e71d575821c glibc-2.4-r2.ebuild 38006 +SHA256 9b583904115df6d8be76fba1f05d5b40597abc4ec383ab48ac21300d1ff9da7a glibc-2.4-r2.ebuild 38006 MISC ChangeLog 91644 RMD160 f2b6032dae413c922a5c66ddcbd78e9472b3a33d SHA1 260472314c99a7f161d2c6a2d995df9777083be0 SHA256 6183ba3c3c9e14b875ed0352983ff615588911b9f9c57de44bddbadd40369a43 size 91644 MD5 81980b9fdc84b5a369639d9145d83e93 ChangeLog 91644 RMD160 f2b6032dae413c922a5c66ddcbd78e9472b3a33d ChangeLog 91644 @@ -617,7 +617,7 @@ SHA256 8ab5579705a9af675ac34e8ed5b5346f8d7953f2857f5bd8f2b574b7fb4406af files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) -iD8DBQFETHvq2+ySkm8kpY0RAu4rAJ9RqVS88yLJGxuZUnHIfrua3CrZSwCgrhI6 -ZBU5zAiM29TBPmpz+8k7zjw= -=yC3a +iD8DBQFETY4v2+ySkm8kpY0RAsE6AJ4zT58h5lPtYXXGVhQ6MfX2tP5POQCfdFft +TT2ZuqYk7ZghgffqwAsIAcA= +=9jsN -----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/glibc-2.4-r2.ebuild b/sys-libs/glibc/glibc-2.4-r2.ebuild index 6454e141804f..a9f28bcb63ad 100644 --- a/sys-libs/glibc/glibc-2.4-r2.ebuild +++ b/sys-libs/glibc/glibc-2.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r2.ebuild,v 1.15 2006/04/24 07:18:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r2.ebuild,v 1.16 2006/04/25 02:48:51 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -164,6 +164,10 @@ SRC_URI=$(get_glibc_src_uri) S=${WORKDIR}/glibc-${GLIBC_RELEASE_VER} ### EXPORTED FUNCTIONS ### +unpack_addon() { + unpack glibc-$1-${GLIBC_RELEASE_VER}.tar.bz2 + mv glibc-$1-${GLIBC_RELEASE_VER} $1 || die +} toolchain-glibc_src_unpack() { # Check NPTL support _before_ we unpack things to save some time want_nptl && check_nptl_support @@ -171,9 +175,9 @@ toolchain-glibc_src_unpack() { unpack glibc-${GLIBC_RELEASE_VER}.tar.bz2 cd "${S}" - #unpack glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 - unpack glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2 && mv glibc-libidn-${GLIBC_RELEASE_VER} libidn - unpack glibc-ports-${GLIBC_RELEASE_VER}.tar.bz2 && mv glibc-ports-${GLIBC_RELEASE_VER} ports + #unpack_addon linuxthreads + unpack_addon libidn + unpack_addon ports if [[ -n ${FEDORA_TARBALL} ]] ; then # only pull out the stuff we actually want @@ -338,7 +342,7 @@ toolchain-glibc_src_install() { make PARALLELMFLAGS="${MAKEOPTS} -j1" \ install_root="${install_root}" \ install || die - else + else # nptlonly cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl einfo "Installing GLIBC ${ABI} with NPTL ..." make PARALLELMFLAGS="${MAKEOPTS} -j1" \ @@ -367,7 +371,8 @@ toolchain-glibc_src_install() { src_lib=$(eval echo */${l}) fi cp -a ${src_lib} "${D}"$(alt_libdir)/tls/${l} || die "copying nptl ${l}" - dosym ${l} "${D}"$(alt_libdir)/tls/$(scanelf -qSF'%S#F' ${src_lib}) + fperms a+rx $(alt_libdir)/tls/${l} + dosym ${l} $(alt_libdir)/tls/$(scanelf -qSF'%S#F' ${src_lib}) # then grab the linker script or the symlink ... if [[ -L ${D}$(alt_usrlibdir)/${l} ]] ; then @@ -376,15 +381,16 @@ toolchain-glibc_src_install() { sed \ -e "s:/${l}:/tls/${l}:g" \ -e "s:/${l/%.so/_nonshared.a}:/nptl/${l/%.so/_nonshared.a}:g" \ - "${D}"$(alt_usrlibdir)/${l} > $(alt_usrlibdir)/nptl/${l} + "${D}"$(alt_usrlibdir)/${l} > "${D}"$(alt_usrlibdir)/nptl/${l} fi # then grab the static lib ... - l=${l/%.so/.a} - cp -a ${a} "${D}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${l}" - l=${l/%.a/_nonshared.a} - if [[ -e ${l} ]] ; then - cp -a ${a} "${D}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${l}" + src_lib=${src_lib/%.so/.a} + [[ ! -e ${src_lib} ]] && src_lib=${src_lib/%.a/_pic.a} + cp -a ${src_lib} "${D}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${src_lib}" + src_lib=${src_lib/%.a/_nonshared.a} + if [[ -e ${src_lib} ]] ; then + cp -a ${src_lib} "${D}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${src_lib}" fi done @@ -461,8 +467,8 @@ toolchain-glibc_src_install() { einfo "Installing info pages..." make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root="${D}" \ - info -i + install_root="${install_root}" \ + info -i || die fi if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then @@ -473,7 +479,7 @@ toolchain-glibc_src_install() { doman *.3thr fi - # Install nscd config file + # Install misc network config files insinto /etc doins "${FILESDIR}"/nscd.conf doins "${FILESDIR}"/nsswitch.conf @@ -508,7 +514,7 @@ toolchain-glibc_src_install() { toolchain-glibc_headers_install() { local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers cd "${GBUILDDIR}" - make install_root="${D}" install-headers || die "install-headers failed" + make install_root="${D}/usr/${CTARGET}" install-headers || die "install-headers failed" # Copy over headers that are not part of install-headers ... these # are pretty much taken verbatim from crosstool, see it for more details insinto $(alt_headers)/bits @@ -542,7 +548,7 @@ toolchain-glibc_pkg_postinst() { if [[ ! -e ${ROOT}/lib/ld.so.1 ]] && use ppc64 && ! has_multilib_profile ; then ## SHOULDN'T THIS BE lib64?? - ln -s ld64.so.1 ${ROOT}/lib/ld.so.1 + ln -s ld64.so.1 "${ROOT}"/lib/ld.so.1 fi if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then |