diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-05-11 05:54:29 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-05-11 05:54:29 +0000 |
| commit | 6706d7b70b6da309742cbfa47bc1efbcb240b38f (patch) | |
| tree | 5511d127bac9b4ea1dd731d45739315b40f9a0bb /sys-fs | |
| parent | Unmasking slotted boost, good luck. (diff) | |
| download | gentoo-2-6706d7b70b6da309742cbfa47bc1efbcb240b38f.tar.gz gentoo-2-6706d7b70b6da309742cbfa47bc1efbcb240b38f.tar.bz2 gentoo-2-6706d7b70b6da309742cbfa47bc1efbcb240b38f.zip | |
Add fix by Victor Ostorga for build failure with gcc-4.4 #269240 by 404 Error.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/reiser4progs/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-fs/reiser4progs/files/reiser4progs-1.0.7-gcc-4.4.patch | 15 | ||||
| -rw-r--r-- | sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild | 11 |
3 files changed, 25 insertions, 8 deletions
diff --git a/sys-fs/reiser4progs/ChangeLog b/sys-fs/reiser4progs/ChangeLog index f170206e0a83..20f1fa12c0fc 100644 --- a/sys-fs/reiser4progs/ChangeLog +++ b/sys-fs/reiser4progs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/reiser4progs # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.36 2009/01/18 06:22:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.37 2009/05/11 05:54:29 vapier Exp $ + + 11 May 2009; Mike Frysinger <vapier@gentoo.org> reiser4progs-1.0.7.ebuild, + +files/reiser4progs-1.0.7-gcc-4.4.patch: + Add fix by Victor Ostorga for build failure with gcc-4.4 #269240 by 404 + Error. *reiser4progs-1.0.7 (18 Jan 2009) diff --git a/sys-fs/reiser4progs/files/reiser4progs-1.0.7-gcc-4.4.patch b/sys-fs/reiser4progs/files/reiser4progs-1.0.7-gcc-4.4.patch new file mode 100644 index 000000000000..3f32af5d78b4 --- /dev/null +++ b/sys-fs/reiser4progs/files/reiser4progs-1.0.7-gcc-4.4.patch @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/269240 + +fix build failure when using gcc-4.4 + +--- reiser4progs-1.0.7/plugin/node/node40/node40.c ++++ reiser4progs-1.0.7/plugin/node/node40/node40.c +@@ -994,7 +994,7 @@ + func = cb_comp_key3; + #elif defined(ENABLE_LARGE_KEYS) + func = cb_comp_key4; +-#elif ++#else + func = NULL; + #endif + diff --git a/sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild b/sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild index b782d56f2185..041e350a4d71 100644 --- a/sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild +++ b/sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild,v 1.2 2009/02/09 18:28:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild,v 1.3 2009/05/11 05:54:29 vapier Exp $ -inherit multilib +inherit multilib eutils MY_P=${PN}-${PV/_p/-} DESCRIPTION="reiser4progs: mkfs, fsck, etc..." @@ -22,11 +22,8 @@ S=${WORKDIR}/${MY_P} src_unpack() { unpack ${A} cd "${S}" - - cat <<-EOF > run-ldconfig - #!/bin/sh - true - EOF + epatch "${FILESDIR}"/${P}-gcc-4.4.patch #269240 + printf '#!/bin/sh\ntrue\n' > run-ldconfig } src_compile() { |