diff options
| author |   Travis Tilley <lv@gentoo.org> | 2004-11-11 02:29:50 +0000 |
|---|---|---|
| committer | Travis Tilley <lv@gentoo.org> | 2004-11-11 02:29:50 +0000 |
| commit | 5fb7fcdbf91c27a9d7d1238e0912d03cf83fb4a1 (patch) | |
| tree | d303236640654e6916d0fdf5f32a9dc54d6486b1 /sys-libs/glibc | |
| parent | initial import for redland (Manifest recommit) (diff) | |
| download | gentoo-2-5fb7fcdbf91c27a9d7d1238e0912d03cf83fb4a1.tar.gz gentoo-2-5fb7fcdbf91c27a9d7d1238e0912d03cf83fb4a1.tar.bz2 gentoo-2-5fb7fcdbf91c27a9d7d1238e0912d03cf83fb4a1.zip | |
remove a patch that's no longer needed because the bug it attempted to work around no longer exists
Diffstat (limited to 'sys-libs/glibc')
| -rw-r--r-- | sys-libs/glibc/files/2.3.3/glibc-2.3.3-ssp-gcc34-after-frandom.patch | 19 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild | 7 |
2 files changed, 1 insertions, 25 deletions
diff --git a/sys-libs/glibc/files/2.3.3/glibc-2.3.3-ssp-gcc34-after-frandom.patch b/sys-libs/glibc/files/2.3.3/glibc-2.3.3-ssp-gcc34-after-frandom.patch deleted file mode 100644 index dd863869c04a..000000000000 --- a/sys-libs/glibc/files/2.3.3/glibc-2.3.3-ssp-gcc34-after-frandom.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ./sysdeps/unix/sysv/linux/ssp.c.old 2004-05-17 06:46:31.000000000 -0400 -+++ ./sysdeps/unix/sysv/linux/ssp.c 2004-05-17 07:46:42.264773000 -0400 -@@ -44,9 +44,15 @@ - #define SSP_SIGTYPE SIGABRT - #endif - -+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) -+#define __attribute_used__ __attribute__((__used__)) -+#else -+#define __attribute_used__ __attribute__((__unused__)) -+#endif -+ - unsigned long __guard = 0UL; - --void -+__attribute_used__ void __attribute__ ((visibility ("default"))) - __guard_setup (void) - { - size_t size; diff --git a/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild b/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild index 7305e23f2eae..b005fd95c7ff 100644 --- a/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild +++ b/sys-libs/glibc/glibc-2.3.3.20040420-r2.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.3.20040420-r2.ebuild,v 1.2 2004/11/10 09:20:22 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3.20040420-r2.ebuild,v 1.3 2004/11/11 02:29:50 lv Exp $ inherit eutils flag-o-matic gcc @@ -287,11 +287,6 @@ src_unpack() { epatch ${FILESDIR}/2.3.3/${LOCAL_P}-propolice-guard-functions-v3.patch cp ${FILESDIR}/2.3.3/ssp.c ${S}/sysdeps/unix/sysv/linux || \ die "failed to copy ssp.c to ${S}/sysdeps/unix/sysv/linux/" - # gcc 3.4 nukes ssp without this patch - if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] - then - epatch ${FILESDIR}/2.3.3/glibc-2.3.3-ssp-gcc34-after-frandom.patch - fi fi # sparc fails when building the components for the normal crt1.o |