From: Mike Frysinger Date: Fri, 29 Dec 2006 22:36:21 +0000 (+0000) Subject: Fix building with gcc-2. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c9cab5855d65f809b543de570993fd24516c1110;p=gentoo.git Fix building with gcc-2. Package-Manager: portage-2.1.2_rc4-r1 --- diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog index 702bb5f885ea..e7484314cc53 100644 --- a/sys-apps/busybox/ChangeLog +++ b/sys-apps/busybox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/busybox # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.116 2006/12/01 22:21:36 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.117 2006/12/29 22:36:21 vapier Exp $ + + 29 Dec 2006; Mike Frysinger +files/1.2.0/gcc2.patch, + busybox-1.2.2.1.ebuild: + Fix building with gcc-2. 01 Dec 2006; Markus Rothe busybox-1.2.2.1.ebuild: Stable on ppc64 diff --git a/sys-apps/busybox/busybox-1.2.2.1.ebuild b/sys-apps/busybox/busybox-1.2.2.1.ebuild index 15781542f73b..caa91bc04cb3 100644 --- a/sys-apps/busybox/busybox-1.2.2.1.ebuild +++ b/sys-apps/busybox/busybox-1.2.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/sys-apps/busybox/busybox-1.2.2.1.ebuild,v 1.2 2006/12/01 22:21:36 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.2.2.1.ebuild,v 1.3 2006/12/29 22:36:21 vapier Exp $ inherit eutils flag-o-matic @@ -101,6 +101,7 @@ src_unpack() { # patches go here! epatch "${FILESDIR}"/1.2.0/bb.patch + epatch "${FILESDIR}"/1.2.0/gcc2.patch # check for a busybox config before making one of our own. # if one exist lets return and use it. diff --git a/sys-apps/busybox/files/1.2.0/gcc2.patch b/sys-apps/busybox/files/1.2.0/gcc2.patch new file mode 100644 index 000000000000..37b223f77c71 --- /dev/null +++ b/sys-apps/busybox/files/1.2.0/gcc2.patch @@ -0,0 +1,19 @@ +--- networking/zcip.c ++++ networking/zcip.c +@@ -299,13 +301,13 @@ int zcip_main(int argc, char *argv[]) + struct timeval tv1; + struct arp_packet p; + ++ int source_ip_conflict = 0; ++ int target_ip_conflict = 0; ++ + fds[0].fd = fd; + fds[0].events = POLLIN; + fds[0].revents = 0; + +- int source_ip_conflict = 0; +- int target_ip_conflict = 0; +- + // poll, being ready to adjust current timeout + if (!timeout) { + timeout = ms_rdelay(PROBE_WAIT);