diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2006-06-04 07:55:51 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2006-06-04 07:55:51 +0000 |
| commit | dbe85d156e361ef5069519af8f88ae7d49bfb224 (patch) | |
| tree | 13378b5f54b77944da3f9431e85548c50d374c5d /net-dialup | |
| parent | drop sparc keyword for now since it doesn't seem to compile? - bug #135467 (diff) | |
| download | gentoo-2-dbe85d156e361ef5069519af8f88ae7d49bfb224.tar.gz gentoo-2-dbe85d156e361ef5069519af8f88ae7d49bfb224.tar.bz2 gentoo-2-dbe85d156e361ef5069519af8f88ae7d49bfb224.zip | |
Patch to fix gcc 4.1 errors (#135234).
(Portage version: 2.0.54-r2)
Diffstat (limited to 'net-dialup')
| -rw-r--r-- | net-dialup/l2tpd/ChangeLog | 6 | ||||
| -rw-r--r-- | net-dialup/l2tpd/Manifest | 13 | ||||
| -rw-r--r-- | net-dialup/l2tpd/files/l2tpd-0.70_pre20031121-gcc41.patch | 16 | ||||
| -rw-r--r-- | net-dialup/l2tpd/l2tpd-0.70_pre20031121.ebuild | 3 |
4 files changed, 25 insertions, 13 deletions
diff --git a/net-dialup/l2tpd/ChangeLog b/net-dialup/l2tpd/ChangeLog index 499dbc226059..655ce482a414 100644 --- a/net-dialup/l2tpd/ChangeLog +++ b/net-dialup/l2tpd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-dialup/l2tpd # Copyright 2003-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/l2tpd/ChangeLog,v 1.16 2006/05/30 21:13:21 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/l2tpd/ChangeLog,v 1.17 2006/06/04 07:55:51 mrness Exp $ + + 04 Jun 2006; Alin Nastac <mrness@gentoo.org> + +files/l2tpd-0.70_pre20031121-gcc41.patch, l2tpd-0.70_pre20031121.ebuild: + Patch to fix gcc 4.1 errors (#135234). 30 May 2006; Alin Nastac <mrness@gentoo.org> files/l2tpd-init, l2tpd-0.70_pre20031121.ebuild: diff --git a/net-dialup/l2tpd/Manifest b/net-dialup/l2tpd/Manifest index b53c886a25df..8555689981d3 100644 --- a/net-dialup/l2tpd/Manifest +++ b/net-dialup/l2tpd/Manifest @@ -1,15 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 83953908bf09487065698fe8df2aaff5 ChangeLog 2320 MD5 032a62f61bd560e76f0130861b79be73 files/digest-l2tpd-0.70_pre20031121 155 +MD5 b585ccb98a0e98b243e3f49335dbd380 files/l2tpd-0.70_pre20031121-gcc41.patch 687 MD5 650e9deed5657b0b1e9722c8316fd70d files/l2tpd-init 718 -MD5 095f265d892e1fe4bce2cfb3e8ceda2d l2tpd-0.70_pre20031121.ebuild 1164 +MD5 df61cf5b0ce0c01ce9aa2763e88fe52a l2tpd-0.70_pre20031121.ebuild 1203 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.2 (GNU/Linux) - -iD8DBQFEfLWGjG8pv1lIUX4RAqrkAKDSMR8O716kYLs1/SucyMSeUvRXjgCgvPDm -QCGafl6GDapU4xSrKvO7pG0= -=pJuq ------END PGP SIGNATURE----- diff --git a/net-dialup/l2tpd/files/l2tpd-0.70_pre20031121-gcc41.patch b/net-dialup/l2tpd/files/l2tpd-0.70_pre20031121-gcc41.patch new file mode 100644 index 000000000000..57840f6bf8a1 --- /dev/null +++ b/net-dialup/l2tpd/files/l2tpd-0.70_pre20031121-gcc41.patch @@ -0,0 +1,16 @@ +diff -ur l2tpd-0.70-pre20031121.orig-orig/aaa.h l2tpd-0.70-pre20031121.orig/aaa.h +--- l2tpd-0.70-pre20031121.orig-orig/aaa.h 2006-06-03 14:26:19.000000000 -0400 ++++ l2tpd-0.70-pre20031121.orig/aaa.h 2006-06-03 14:27:41.000000000 -0400 +@@ -48,7 +48,7 @@ + }; + + extern struct lns *get_lns (struct tunnel *); +-extern struct addr_ent *uaddr[]; ++static struct addr_ent *uaddr[]; + extern unsigned int get_addr (struct iprange *); + extern void reserve_addr (unsigned int); + extern void unreserve_addr (unsigned int); +Only in l2tpd-0.70-pre20031121.orig: .aaa.h.swp +Only in l2tpd-0.70-pre20031121.orig: aaa.o +Only in l2tpd-0.70-pre20031121.orig: l2tpd +Only in l2tpd-0.70-pre20031121.orig: md5.o diff --git a/net-dialup/l2tpd/l2tpd-0.70_pre20031121.ebuild b/net-dialup/l2tpd/l2tpd-0.70_pre20031121.ebuild index b06883cc32f5..ab0dd26a7994 100644 --- a/net-dialup/l2tpd/l2tpd-0.70_pre20031121.ebuild +++ b/net-dialup/l2tpd/l2tpd-0.70_pre20031121.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-dialup/l2tpd/l2tpd-0.70_pre20031121.ebuild,v 1.6 2006/05/30 21:13:21 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/l2tpd/l2tpd-0.70_pre20031121.ebuild,v 1.7 2006/06/04 07:55:51 mrness Exp $ inherit eutils @@ -25,6 +25,7 @@ src_unpack() { unpack ${A} epatch "${MY_P}-2.diff" + epatch "${FILESDIR}/${P}-gcc41.patch" #Put CFLAGS from make.conf and disable builtin definition of log function sed -i.orig -e "s|-ggdb|${CFLAGS} -fno-builtin-log|" "${S}/Makefile" || die "failed to change CFLAGS in Makefile" |