diff options
| author |   Travis Tilley <lv@gentoo.org> | 2004-10-07 00:47:06 +0000 |
|---|---|---|
| committer | Travis Tilley <lv@gentoo.org> | 2004-10-07 00:47:06 +0000 |
| commit | 671871de9bf0323450025c474dbed2e6d8bf766b (patch) | |
| tree | 38db702d38f8644e418c4c067e4fc9b693cc375b | |
| parent | Stable on alpha, bug 66501. (Manifest recommit) (diff) | |
| download | gentoo-2-671871de9bf0323450025c474dbed2e6d8bf766b.tar.gz gentoo-2-671871de9bf0323450025c474dbed2e6d8bf766b.tar.bz2 gentoo-2-671871de9bf0323450025c474dbed2e6d8bf766b.zip | |
fix compiling iputils using newer glibc snapshots
| -rw-r--r-- | net-misc/iputils/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/iputils/files/iputils-021109-linux-udp-header.patch | 15 | ||||
| -rw-r--r-- | net-misc/iputils/iputils-021109-r3.ebuild | 6 |
3 files changed, 25 insertions, 2 deletions
diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog index 671a6645cc7d..6f5e2b2e5d29 100644 --- a/net-misc/iputils/ChangeLog +++ b/net-misc/iputils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/iputils # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.32 2004/08/04 18:51:46 avenj Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.33 2004/10/07 00:47:06 lv Exp $ + + 06 Oct 2004; Travis Tilley <lv@gentoo.org> + +files/iputils-021109-linux-udp-header.patch, iputils-021109-r3.ebuild: + fix compiling iputils using newer glibc snapshots 04 Aug 2004; Jon Portnoy <avenj@gentoo.org> iputils-021109-r3.ebuild : Fix bison sed line. Bugs 59414 and 59191. diff --git a/net-misc/iputils/files/iputils-021109-linux-udp-header.patch b/net-misc/iputils/files/iputils-021109-linux-udp-header.patch new file mode 100644 index 000000000000..b60a23534dd9 --- /dev/null +++ b/net-misc/iputils/files/iputils-021109-linux-udp-header.patch @@ -0,0 +1,15 @@ +diff -Nru iputils.old/traceroute6.c iputils/traceroute6.c +--- iputils.old/traceroute6.c 2004-09-29 21:10:48.540700488 -0400 ++++ iputils/traceroute6.c 2004-09-29 21:11:58.667039664 -0400 +@@ -244,7 +244,11 @@ + #include <netinet/in.h> + #include <netinet/ip.h> + #include <netinet/ip_icmp.h> ++#if __linux__ ++#include <linux/udp.h> ++#else + #include <netinet/udp.h> ++#endif + + #include <linux/ipv6.h> + #include <linux/in6.h> diff --git a/net-misc/iputils/iputils-021109-r3.ebuild b/net-misc/iputils/iputils-021109-r3.ebuild index 49302aabe016..ec8d82963fc7 100644 --- a/net-misc/iputils/iputils-021109-r3.ebuild +++ b/net-misc/iputils/iputils-021109-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-021109-r3.ebuild,v 1.10 2004/08/09 04:34:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-021109-r3.ebuild,v 1.11 2004/10/07 00:47:06 lv Exp $ inherit flag-o-matic gcc gnuconfig eutils @@ -38,6 +38,10 @@ src_unpack() { epatch ${FILESDIR}/${PV}-gcc34.patch epatch ${FILESDIR}/${PV}-no-pfkey-search.patch + + # make iputils work with newer glibc snapshots + epatch ${FILESDIR}/${P}-linux-udp-header.patch + sed -i \ -e "/^CCOPT=/s:-O2:${CFLAGS}:" \ -e "/^CC=/s:gcc:$(gcc-getCC):" \ |