diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-04-20 08:32:59 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-04-20 08:32:59 +0000 |
| commit | 29b82e1ba1019706b1c545720974c9b0ce573a5d (patch) | |
| tree | 76134e851330a6616511876b4eb7b1edb78e00bf /app-text/recode | |
| parent | old (diff) | |
| download | gentoo-2-29b82e1ba1019706b1c545720974c9b0ce573a5d.tar.gz gentoo-2-29b82e1ba1019706b1c545720974c9b0ce573a5d.tar.bz2 gentoo-2-29b82e1ba1019706b1c545720974c9b0ce573a5d.zip | |
Fix building with gcc-4.3 #209036.
(Portage version: 2.2_pre5)
Diffstat (limited to 'app-text/recode')
| -rw-r--r-- | app-text/recode/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/recode/files/recode-3.6-gcc43.patch | 20 | ||||
| -rw-r--r-- | app-text/recode/recode-3.6-r2.ebuild | 8 |
3 files changed, 30 insertions, 4 deletions
diff --git a/app-text/recode/ChangeLog b/app-text/recode/ChangeLog index 93fff7a51eb3..5369bfe1ed33 100644 --- a/app-text/recode/ChangeLog +++ b/app-text/recode/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/recode # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.47 2008/01/19 15:00:07 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.48 2008/04/20 08:32:59 vapier Exp $ + + 20 Apr 2008; Mike Frysinger <vapier@gentoo.org> + +files/recode-3.6-gcc43.patch, recode-3.6-r2.ebuild: + Fix building with gcc-4.3 #209036. 19 Jan 2008; Fabian Groffen <grobian@gentoo.org> recode-3.6-r1.ebuild, recode-3.6-r2.ebuild: diff --git a/app-text/recode/files/recode-3.6-gcc43.patch b/app-text/recode/files/recode-3.6-gcc43.patch new file mode 100644 index 000000000000..beaf26e9a3e1 --- /dev/null +++ b/app-text/recode/files/recode-3.6-gcc43.patch @@ -0,0 +1,20 @@ +http://bugs.gentoo.org/209036 + +fix building with gcc-4.3 + +--- src/recodext.h 2008-04-03 18:35:42 +0000 ++++ src/recodext.h 2008-04-03 18:36:32 +0000 +@@ -215,10 +215,10 @@ + struct recode_single *unsurfacer; + + /* Non zero if this is an acceptable charset (not only a surface). */ +- enum recode_symbol_type type : 3; ++ enum recode_symbol_type type : 2; + + /* Non zero if this one should be ignored. */ +- bool ignore : 2; ++ bool ignore : 1; + }; + + struct recode_surface_list + diff --git a/app-text/recode/recode-3.6-r2.ebuild b/app-text/recode/recode-3.6-r2.ebuild index 0e1129d68b0a..9b3f79d09a7e 100644 --- a/app-text/recode/recode-3.6-r2.ebuild +++ b/app-text/recode/recode-3.6-r2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.6-r2.ebuild,v 1.21 2008/01/19 15:00:07 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.6-r2.ebuild,v 1.22 2008/04/20 08:32:59 vapier Exp $ -inherit flag-o-matic eutils libtool toolchain-funcs +inherit eutils libtool toolchain-funcs DEB_VER=11 DESCRIPTION="Convert files between various character sets" @@ -20,6 +20,8 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/${P}-debian-${DEB_VER}.patch + epatch "${FILESDIR}"/${P}-gcc43.patch #209036 + sed -i '1i#include <stdlib.h>' src/argmatch.c || die # Needed under FreeBSD, too epatch "${FILESDIR}"/${P}-ppc-macos.diff @@ -37,7 +39,7 @@ src_compile() { } src_install() { - make DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install || die "make install failed" dodoc AUTHORS BACKLOG ChangeLog NEWS README THANKS TODO rm -f "${D}"/usr/lib/charset.alias } |