diff options
| author |   Markus Ullmann <jokey@gentoo.org> | 2006-06-30 14:54:22 +0000 |
|---|---|---|
| committer | Markus Ullmann <jokey@gentoo.org> | 2006-06-30 14:54:22 +0000 |
| commit | c882d07ac6bd7864f7530ccc5ab8f93cdf9c52ef (patch) | |
| tree | 7ea4c2c8df2453c8066dd8a6a2b74aa62f2d676a /net-irc | |
| parent | Stable on amd64. (diff) | |
| download | gentoo-2-c882d07ac6bd7864f7530ccc5ab8f93cdf9c52ef.tar.gz gentoo-2-c882d07ac6bd7864f7530ccc5ab8f93cdf9c52ef.tar.bz2 gentoo-2-c882d07ac6bd7864f7530ccc5ab8f93cdf9c52ef.zip | |
Adding amd64 multilib patch wrt bug #105258
(Portage version: 2.1.1_pre1-r5)
Diffstat (limited to 'net-irc')
| -rw-r--r-- | net-irc/ircd-hybrid/ChangeLog | 6 | ||||
| -rw-r--r-- | net-irc/ircd-hybrid/files/7.2.1-amd64-multilib.patch | 23 | ||||
| -rw-r--r-- | net-irc/ircd-hybrid/ircd-hybrid-7.2.1.ebuild | 3 |
3 files changed, 30 insertions, 2 deletions
diff --git a/net-irc/ircd-hybrid/ChangeLog b/net-irc/ircd-hybrid/ChangeLog index 630e6cc365c5..bf4e1ae22320 100644 --- a/net-irc/ircd-hybrid/ChangeLog +++ b/net-irc/ircd-hybrid/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-irc/ircd-hybrid # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ChangeLog,v 1.19 2006/06/05 19:45:35 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ChangeLog,v 1.20 2006/06/30 14:54:22 jokey Exp $ + + 30 Jun 2006; Markus Ullmann <jokey@gentoo.org> + +files/7.2.1-amd64-multilib.patch, ircd-hybrid-7.2.1.ebuild: + Adding amd64 multilib patch wrt bug #105258 *ircd-hybrid-7.2.1 (05 Jun 2006) diff --git a/net-irc/ircd-hybrid/files/7.2.1-amd64-multilib.patch b/net-irc/ircd-hybrid/files/7.2.1-amd64-multilib.patch new file mode 100644 index 000000000000..e2e056781788 --- /dev/null +++ b/net-irc/ircd-hybrid/files/7.2.1-amd64-multilib.patch @@ -0,0 +1,23 @@ +diff -urN ircd-hybrid-7.2.1.orig/src/lex.yy.c ircd-hybrid-7.2.1/src/lex.yy.c +--- ircd-hybrid-7.2.1.orig/src/lex.yy.c 2006-06-24 18:44:37.000000000 +0200 ++++ ircd-hybrid-7.2.1/src/lex.yy.c 2006-06-24 18:45:39.000000000 +0200 +@@ -7,8 +7,9 @@ + + #if defined(__FreeBSD__) + #include <sys/cdefs.h> ++#define REALLOC_SUFFIX __unused + #else +-#define __unused ++#define REALLOC_SUFFIX + #endif + + #define FLEX_SCANNER +@@ -247,7 +248,7 @@ + YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len )); + + static void *yy_flex_alloc YY_PROTO(( yy_size_t )); +-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) __unused; ++static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) REALLOC_SUFFIX; + static void yy_flex_free YY_PROTO(( void * )); + + #define yy_new_buffer yy_create_buffer diff --git a/net-irc/ircd-hybrid/ircd-hybrid-7.2.1.ebuild b/net-irc/ircd-hybrid/ircd-hybrid-7.2.1.ebuild index 1898973bea31..c4ac78fe8049 100644 --- a/net-irc/ircd-hybrid/ircd-hybrid-7.2.1.ebuild +++ b/net-irc/ircd-hybrid/ircd-hybrid-7.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ircd-hybrid-7.2.1.ebuild,v 1.1 2006/06/05 19:45:35 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ircd-hybrid-7.2.1.ebuild,v 1.2 2006/06/30 14:54:22 jokey Exp $ inherit eutils toolchain-funcs @@ -37,6 +37,7 @@ pkg_setup() { src_unpack() { unpack ${A} epatch "${FILESDIR}"/7.2.1-default-config.patch + epatch "${FILESDIR}"/7.2.1-amd64-multilib.patch } src_compile() { |