From 6e6e130d2cb80e716ae803813b9e38233e8d724b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 3 Dec 2004 04:51:54 +0000 Subject: merge fixes between versions --- sys-libs/glibc/Manifest | 10 ++-- sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild | 78 +++++++++------------------ sys-libs/glibc/glibc-2.3.4.20041102.ebuild | 16 +++--- 3 files changed, 36 insertions(+), 68 deletions(-) (limited to 'sys-libs') diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 9e1da5b78f30..647f34b8043d 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -7,8 +7,8 @@ MD5 e4f211c5762191a6fce67b15caf38c31 glibc-2.3.2-r12.ebuild 20537 MD5 d59fdfb3aca88476d792b71922c765a5 glibc-2.3.3.20040420-r2.ebuild 21630 MD5 48dcbf88afd15efb62b4313337261968 glibc-2.3.4.20040619-r2.ebuild 21077 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 -MD5 e6a2c77560bb1519bec6fce7b4601bca glibc-2.3.4.20040808-r1.ebuild 23137 -MD5 623c3ff2d1000ed5b9a67ae15c53083a glibc-2.3.4.20041102.ebuild 26978 +MD5 4de3ef52fedc7ed9a8129ebd5f552756 glibc-2.3.4.20040808-r1.ebuild 22266 +MD5 d581e8fe852f6916509363daad57c1fb glibc-2.3.4.20041102.ebuild 26933 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143 MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r12 312 MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312 @@ -137,7 +137,7 @@ MD5 039f62650037a4a15cef3066b26d27c9 files/2.3.4/glibc-2.3.4-mips-update-__throw -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.10 (GNU/Linux) -iD8DBQFBr+0/roRuSHgZdywRAmiHAJ4lBL/N3ibs5M5Z9BlPeZsO1bZIxgCgiiJs -Z5Ok8g+z68qfo56IP5+XZ1Y= -=k+1S +iD8DBQFBr/D6roRuSHgZdywRAlXuAJ4lgUvJ760guYWqkjDgj1le3btpwQCfawj/ +a955a/5VwUiF3gdozTR8GRY= +=MCya -----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild index 3c6474f4043e..0753ff106769 100644 --- a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild +++ b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild @@ -1,16 +1,17 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.12 2004/11/10 11:16:40 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.13 2004/12/03 04:51:54 vapier Exp $ -inherit eutils flag-o-matic gcc +inherit eutils flag-o-matic gcc versionator # Branch update support. Following will disable: # BRANCH_UPDATE= BRANCH_UPDATE="20040808" - # Minimum kernel version we support # (Recent snapshots fails with 2.6.5 and earlier) +# also, we do not have a single 2.4 kernel in the tree with backported +# support required to enable nptl. MIN_KERNEL_VERSION="2.6.5" @@ -40,7 +41,7 @@ SRC_URI="http://dev.gentoo.org/~lv/${PN}-${BASE_PV}.tar.bz2 LICENSE="LGPL-2" SLOT="2.2" KEYWORDS="x86 amd64 hppa ppc64 ~ppc -mips" -IUSE="nls pic build nptl erandom hardened makecheck multilib debug userlocales" +IUSE="nls pic build nptl erandom hardened multilib debug userlocales" RESTRICT="nostrip" # we'll handle stripping ourself #46186 # We need new cleanup attribute support from gcc for NPTL among things ... @@ -63,19 +64,21 @@ PROVIDE="virtual/glibc virtual/libc" # (very) Theoretical cross-compiler support -[ -z "${CCHOST}" ] && CCHOST="${CHOST}" +export CTARGET="${CTARGET:-${CHOST}}" # We need to be able to set alternative headers for # compiling for non-native platform # Will also become useful for testing kernel-headers without screwing up -# whole system +# the whole system. +# note: intentionally undocumented. [ -z "${ALT_HEADERS}" ] && ALT_HEADERS="${ROOT}/usr/include" setup_flags() { - # Over-zealous CFLAGS can often cause problems. What may work for one person may not - # work for another. To avoid a large influx of bugs relating to failed builds, we - # strip most CFLAGS out to ensure as few problems as possible. + # Over-zealous CFLAGS can often cause problems. What may work for one + # person may not work for another. To avoid a large influx of bugs + # relating to failed builds, we strip most CFLAGS out to ensure as few + # problems as possible. strip-flags strip-unsupported-flags @@ -90,14 +93,15 @@ setup_flags() { # Sparc64 Only support... if [ "${PROFILE_ARCH}" = "sparc64" ]; then - # Get rid of -mcpu options (the CHOST will fix this up) and flags known to fail + # Get rid of -mcpu options (the CHOST will fix this up) and flags + # known to fail filter-flags "-mcpu=ultrasparc -mcpu=v9 -mvis" # Setup the CHOST properly to insure "sparcv9" # This passes -mcpu=ultrasparc -Wa,-Av9a to the compiler if [ "${CHOST}" = "sparc-unknown-linux-gnu" ]; then export CHOST="sparcv9-unknown-linux-gnu" - export CCHOST="sparcv9-unknown-linux-gnu" + export CTARGET="sparcv9-unknown-linux-gnu" fi fi fi @@ -105,16 +109,19 @@ setup_flags() { if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then # broken in 3.4.x replace-flags -march=pentium-m -mtune=pentium3 - ewarn "-march=pentium-m seems to be broken in gcc 3.4, changing to -mtune=pentium3" + fi + + if gcc -v 2>&1 | grep -q 'gcc version 3.[0123]'; then + append-flags -finline-limit=2000 fi # We don't want these flags for glibc filter-flags -fomit-frame-pointer -malign-double filter-ldflags -pie - # Lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here + # Lock glibc at -O2 -- linuxthreads needs it and we want to be + # conservative here append-flags -O2 - export LDFLAGS="${LDFLAGS//-Wl,--relax}" } @@ -183,7 +190,7 @@ check_nptl_support() { want_nptl() { if use nptl; then # Archs that can use NPTL - if use amd64 || use alpha || use ia64 || use ppc || \ + if use amd64 || use ia64 || use ppc || \ use ppc64 || use s390 || use sparc; then return 0 fi @@ -219,24 +226,6 @@ want_tls() { } -do_makecheck() { - ATIME=`mount | awk '{ print $3,$6 }' | grep ^\/\ | grep noatime` - if [ "$ATIME" = "" ]; then - cd ${WORKDIR}/build - make check || die - else - ewarn "remounting / without noatime option so that make check" - ewarn "does not fail!" - epause 2 - mount / -o remount,atime - cd ${WORKDIR}/build - make check || die - einfo "remounting / with noatime" - mount / -o remount,noatime - fi -} - - install_locales() { unset LANGUAGE LANG LC_ALL cd ${WORKDIR}/build @@ -247,8 +236,8 @@ install_locales() { setup_locales() { - if use !userlocales || use makecheck; then - einfo "makecheck in USE or userlocales not enabled, installing -ALL- locales..." + if use !userlocales; then + einfo "userlocales not enabled, installing -ALL- locales..." install_locales || die elif [ -e /etc/locales.build ]; then einfo "Installing locales in /etc/locales.build..." @@ -280,8 +269,6 @@ pkg_setup() { die "GCC too old" fi echo - - hasq sandbox $FEATURES && use makecheck && die "sandbox breaks make check. either take makecheck out of USE or set FEATURES=-sandbox" } @@ -496,7 +483,6 @@ src_unpack() { # SSP support in glibc (where it belongs) do_ssp_patches - # PaX-related Patches do_pax_patches @@ -506,7 +492,6 @@ src_unpack() { # hardened toolchain/relro/nptl/security/etc fixes do_hardened_fixes - # Arch specific patching use amd64 && do_arch_amd64_patches use alpha && do_arch_alpha_patches @@ -571,7 +556,7 @@ src_compile() { cd ${WORKDIR}/build ${S}/configure \ --build=${CHOST} \ - --host=${CCHOST} \ + --host=${CTARGET} \ --disable-profile \ --without-gd \ --without-cvs \ @@ -697,17 +682,6 @@ EOF # this test isn't using the correct directory on ppc64 # and really it's a worthless test use !ppc64 && must_exist /$(get_libdir)/ libpthread.so.0 - - # this whole section is useless, it fails if sandbox is LOADED, not if it's - # enabled. but forcing sandbox not to load isnt an option... - if use makecheck; then - local OLD_SANDBOX_ON="${SANDBOX_ON}" - # make check will fail if sandbox is enabled. Do not do it - # globally though, else we might fail to find sandbox violations ... - SANDBOX_ON="0" - do_makecheck - SANDBOX_ON="${OLD_SANDBOX_ON}" - fi } fix_lib64_symlinks() { @@ -795,8 +769,6 @@ pkg_postinst() { fi } - must_exist() { test -e ${D}/${1}/${2} || die "${1}/${2} was not installed" } - diff --git a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild index 4c407dd2d473..bb88f05efd62 100644 --- a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild +++ b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.6 2004/11/22 16:28:57 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.7 2004/12/03 04:51:54 vapier Exp $ inherit eutils flag-o-matic gcc versionator @@ -40,7 +40,7 @@ SRC_URI="http://dev.gentoo.org/~lv/${PN}-${BASE_PV}.tar.bz2 LICENSE="LGPL-2" SLOT="2.2" -KEYWORDS="~amd64 ppc64 -hppa ~ia64 ~ppc ~x86 ~mips -*" +KEYWORDS="~amd64 ppc64 -hppa ~ia64 ~ppc ~x86 ~mips" IUSE="nls pic build nptl nptlonly erandom hardened multilib debug userlocales nomalloccheck" RESTRICT="nostrip" # we'll handle stripping ourself #46186 @@ -64,10 +64,10 @@ PROVIDE="virtual/glibc virtual/libc" # (very) Theoretical cross-compiler support -[ -z "${CTARGET}" ] && CTARGET="${CHOST}" +export CTARGET="${CTARGET:-${CHOST}}" -# We need to be able to set alternative headers for compiling for non-native -# platforms. +# We need to be able to set alternative headers for +# compiling for non-native platform # Will also become useful for testing kernel-headers without screwing up # the whole system. # note: intentionally undocumented. @@ -106,7 +106,7 @@ setup_flags() { fi fi - if version_is_at_least 3.4.0 ; then + if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then # broken in 3.4.x replace-flags -march=pentium-m -mtune=pentium3 fi @@ -122,7 +122,6 @@ setup_flags() { # Lock glibc at -O2 -- linuxthreads needs it and we want to be # conservative here append-flags -O2 - export LDFLAGS="${LDFLAGS//-Wl,--relax}" } @@ -326,8 +325,6 @@ do_arch_hppa_patches() { use hardened && epatch ${FILESDIR}/2.3.4/glibc-2.3.4-hppa-hardened-disable__init_arrays.patch - einfo "Done with hppa patches." - } @@ -905,4 +902,3 @@ pkg_postinst() { einfo "remove the line that disables it (mdns off)." echo } - -- cgit v1.2.3-65-gdbad