diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-03-01 02:21:06 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-03-01 02:21:06 +0000 |
| commit | 3e5ff2f36a538e6c988848c8ee092b8809e9b8db (patch) | |
| tree | 17b5ba714139a89ef47db2018520a65bef69ae0b /sys-libs | |
| parent | Version bump (diff) | |
| download | historical-3e5ff2f36a538e6c988848c8ee092b8809e9b8db.tar.gz historical-3e5ff2f36a538e6c988848c8ee092b8809e9b8db.tar.bz2 historical-3e5ff2f36a538e6c988848c8ee092b8809e9b8db.zip | |
some flag updates from kevquinn
Package-Manager: portage-2.1.2-r12
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/Manifest | 14 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.5.ebuild | 19 |
2 files changed, 18 insertions, 15 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 00ebec38c509..e3ebbed697e3 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -492,10 +492,10 @@ EBUILD glibc-2.4-r4.ebuild 39210 RMD160 fd782b08e862bd1889b9d6dc73386f6ff43ce676 MD5 f7e1022963b4ac00d04110ef57c1a0eb glibc-2.4-r4.ebuild 39210 RMD160 fd782b08e862bd1889b9d6dc73386f6ff43ce676 glibc-2.4-r4.ebuild 39210 SHA256 d05fc7bf0c6cd701443f61328afb4e80ce6ff6d7d364de346cfdc297ffedc5df glibc-2.4-r4.ebuild 39210 -EBUILD glibc-2.5.ebuild 37691 RMD160 f0523cfa8e224066441ae73546da6380eb1c5016 SHA1 e177fee08fa6070928a7cd6bd679d5123c58cbc5 SHA256 e608a9d390e24ee8bfd50e889b276333160d5d7850a6f281c389e7b6b8ec11aa -MD5 ee361fce8e092d9ab35fdac2067f8b74 glibc-2.5.ebuild 37691 -RMD160 f0523cfa8e224066441ae73546da6380eb1c5016 glibc-2.5.ebuild 37691 -SHA256 e608a9d390e24ee8bfd50e889b276333160d5d7850a6f281c389e7b6b8ec11aa glibc-2.5.ebuild 37691 +EBUILD glibc-2.5.ebuild 37912 RMD160 36a5ea1d569edfccc3f850235a3168b29debce0f SHA1 8a07038fa0e05905743497f93c0c18f3804dc503 SHA256 c361581400a2c5f6422a0d7545335ba7582c259428d4f76d52c0e8d213572bb1 +MD5 44797f3a8f221ce2730a770cc1973161 glibc-2.5.ebuild 37912 +RMD160 36a5ea1d569edfccc3f850235a3168b29debce0f glibc-2.5.ebuild 37912 +SHA256 c361581400a2c5f6422a0d7545335ba7582c259428d4f76d52c0e8d213572bb1 glibc-2.5.ebuild 37912 MISC ChangeLog 99099 RMD160 00dd5b6474523bf1c9d9c10ef508c5aff45494ff SHA1 79aa024a9d080579a44aa293e724a191b03cea92 SHA256 28d3f4aeab543ee75b42a1474ab2b40c57917e08f076fe432225dc54d612d364 MD5 82e748bdabd35a7dca824001b508a94d ChangeLog 99099 RMD160 00dd5b6474523bf1c9d9c10ef508c5aff45494ff ChangeLog 99099 @@ -531,7 +531,7 @@ SHA256 c20b8f42085597085e3589fbfd2dc5351f0c63a5492a55f82b59a1481b2a28f3 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFF5jZh8bi6rjpTunYRAoQcAJ4wTUzzpH2YP+xATVa4MkvI8D1piQCgxYzP -83ZFUuTkw99ElMGYikaqKFM= -=KLMk +iD8DBQFF5jjx8bi6rjpTunYRAtcQAKDY0fcNSqtKhPxsqCe8KFKD9OSXvwCeIjAa +6K1BLA/E/YqHVwhtqj/E/tM= +=qJWj -----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/glibc-2.5.ebuild b/sys-libs/glibc/glibc-2.5.ebuild index d95a75dc9776..4e8a86304081 100644 --- a/sys-libs/glibc/glibc-2.5.ebuild +++ b/sys-libs/glibc/glibc-2.5.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.5.ebuild,v 1.37 2007/03/01 02:10:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5.ebuild,v 1.38 2007/03/01 02:21:06 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -616,6 +616,8 @@ setup_flags() { # we are building when pulling glibc on a multilib profile CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}} CFLAGS=${CFLAGS_BASE} + CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}} + CXXFLAGS=${CXXFLAGS_BASE} ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}} ASFLAGS=${ASFLAGS_BASE} @@ -684,17 +686,18 @@ setup_flags() { CBUILD_OPT=${CTARGET_OPT} fi - if $(tc-getCC ${CTARGET}) -v 2>&1 | grep -q 'gcc version 3.[0123]'; then - append-flags -finline-limit=2000 - fi - - # We dont want these flags for glibc - filter-ldflags -pie - # Lock glibc at -O2 -- linuxthreads needs it and we want to be # conservative here. -fno-strict-aliasing is to work around #155906 filter-flags -O? append-flags -O2 -fno-strict-aliasing + + # building glibc with SSP is fraught with difficulty, especially + # due to __stack_chk_fail_local which would mean significant changes + # to the glibc build process. See bug #94325 + filter-flags -fstack-protector + + # Don't let the compiler automatically build PIEs unless USE=hardened. + use hardened || filter-flags -fPIE } check_kheader_version() { |