diff options
author | Hanno Böck <hanno@gentoo.org> | 2005-11-28 18:35:27 +0000 |
---|---|---|
committer | Hanno Böck <hanno@gentoo.org> | 2005-11-28 18:35:27 +0000 |
commit | ed114c3c3d86c4e8acde0bebc809de88e87f1271 (patch) | |
tree | 8ad01231f6f0eaea64de55270666c3066b595439 /app-admin/fam | |
parent | Added block of >=tetex-3.0 as this package is now part of tetex. (diff) | |
download | gentoo-2-ed114c3c3d86c4e8acde0bebc809de88e87f1271.tar.gz gentoo-2-ed114c3c3d86c4e8acde0bebc809de88e87f1271.tar.bz2 gentoo-2-ed114c3c3d86c4e8acde0bebc809de88e87f1271.zip |
gcc41 fix for fam
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'app-admin/fam')
-rw-r--r-- | app-admin/fam/ChangeLog | 6 | ||||
-rw-r--r-- | app-admin/fam/fam-2.7.0-r4.ebuild | 5 | ||||
-rw-r--r-- | app-admin/fam/files/fam-2.7.0-gcc41.patch | 14 |
3 files changed, 23 insertions, 2 deletions
diff --git a/app-admin/fam/ChangeLog b/app-admin/fam/ChangeLog index c6b7a7a29487..df9fbc2af81f 100644 --- a/app-admin/fam/ChangeLog +++ b/app-admin/fam/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/fam # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.34 2005/10/02 11:34:24 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.35 2005/11/28 18:35:27 hanno Exp $ + + 28 Nov 2005; Hanno Boeck <hanno@gentoo.org> +files/fam-2.7.0-gcc41.patch, + fam-2.7.0-r4.ebuild: + Fix for gcc 4.1. 02 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> fam-2.7.0-r2.ebuild: Stable on sh. diff --git a/app-admin/fam/fam-2.7.0-r4.ebuild b/app-admin/fam/fam-2.7.0-r4.ebuild index 78eb0b0d4fc8..aaee29154224 100644 --- a/app-admin/fam/fam-2.7.0-r4.ebuild +++ b/app-admin/fam/fam-2.7.0-r4.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/app-admin/fam/fam-2.7.0-r4.ebuild,v 1.2 2005/10/02 11:34:24 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r4.ebuild,v 1.3 2005/11/28 18:35:27 hanno Exp $ inherit libtool eutils gnuconfig @@ -31,6 +31,9 @@ src_unpack() { # Use limits correctly -#89478 epatch "${FILESDIR}/${P}-limits.patch" + # Fix gcc 4.1 problems + epatch ${FILESDIR}/${P}-gcc41.patch + # Fix permission problems with user* in FEATURES (#35307) chmod u+w ${S}/configure diff --git a/app-admin/fam/files/fam-2.7.0-gcc41.patch b/app-admin/fam/files/fam-2.7.0-gcc41.patch new file mode 100644 index 000000000000..09104e5fcbdd --- /dev/null +++ b/app-admin/fam/files/fam-2.7.0-gcc41.patch @@ -0,0 +1,14 @@ +diff -dpruN fam-2.7.0.orig/src/DNotify.h fam-2.7.0/src/DNotify.h +--- fam-2.7.0.orig/src/DNotify.h 2005-11-16 08:49:13.000000000 +0100 ++++ fam-2.7.0/src/DNotify.h 2005-11-16 08:54:04.972188928 +0100 +@@ -59,8 +59,8 @@ private: + static int pipe_write_fd; + static int pipe_read_fd; + static int change_queue[QUEUESIZE]; +- static volatile sig_atomic_t DNotify::queue_overflowed; +- static volatile sig_atomic_t DNotify::queue_changed; ++ static volatile sig_atomic_t queue_overflowed; ++ static volatile sig_atomic_t queue_changed; + static volatile int queue_head; // Only modified by read handler + static volatile int queue_tail; // Only modified by signal handler + static EventHandler ehandler; |