diff options
| author |   Daniel Goller <morfic@gentoo.org> | 2004-09-04 00:33:24 +0000 |
|---|---|---|
| committer | Daniel Goller <morfic@gentoo.org> | 2004-09-04 00:33:24 +0000 |
| commit | c77b772f5db051759977e6c4a9ed36269f4bb855 (patch) | |
| tree | c2c69472625abcb8308b107e9762d70556d5774a /net-misc/udhcp | |
| parent | x11-plugins/wmcoincoin-2.5.0c stable for x86. (Manifest recommit) (diff) | |
| download | gentoo-2-c77b772f5db051759977e6c4a9ed36269f4bb855.tar.gz gentoo-2-c77b772f5db051759977e6c4a9ed36269f4bb855.tar.bz2 gentoo-2-c77b772f5db051759977e6c4a9ed36269f4bb855.zip | |
applying gcc3.4 patch fixing bug #62714
Diffstat (limited to 'net-misc/udhcp')
| -rw-r--r-- | net-misc/udhcp/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/udhcp/Manifest | 3 | ||||
| -rw-r--r-- | net-misc/udhcp/files/udhcp-gcc-3.4.patch | 11 | ||||
| -rw-r--r-- | net-misc/udhcp/udhcp-0.9.8-r3.ebuild | 15 |
4 files changed, 30 insertions, 4 deletions
diff --git a/net-misc/udhcp/ChangeLog b/net-misc/udhcp/ChangeLog index b2b676e33f46..89f634ac2759 100644 --- a/net-misc/udhcp/ChangeLog +++ b/net-misc/udhcp/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/udhcp # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/udhcp/ChangeLog,v 1.13 2004/07/01 22:06:12 squinky86 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/udhcp/ChangeLog,v 1.14 2004/09/04 00:33:24 morfic Exp $ + + 03 Sep 2004; Daniel Goller <morfic@gentoo.org> udhcp-0.9.8-r3.ebuild: + applying gcc3.4 patch, closing bug 62714 01 Jul 2004; Jon Hood <squinky86@gentoo.org> udhcp-0.9.8-r2.ebuild, udhcp-0.9.8-r3.ebuild: diff --git a/net-misc/udhcp/Manifest b/net-misc/udhcp/Manifest index 6df43ad57924..a672bd592de5 100644 --- a/net-misc/udhcp/Manifest +++ b/net-misc/udhcp/Manifest @@ -1,6 +1,7 @@ MD5 95f641eac6ffcf9606184be86bfdb860 udhcp-0.9.8-r2.ebuild 843 MD5 ef5b951d02cd07ce64e8e32234173c42 ChangeLog 1658 -MD5 c03a0c4ab6b74cd6112e61f84456c822 udhcp-0.9.8-r3.ebuild 1029 +MD5 b42e6fc74a4252fa26b325c3eba33561 udhcp-0.9.8-r3.ebuild 1197 MD5 83ca9ef49068eb2140999999f245f486 files/digest-udhcp-0.9.8-r2 62 MD5 83ca9ef49068eb2140999999f245f486 files/digest-udhcp-0.9.8-r3 62 +MD5 841852ac59a61a1940dd9d509821f231 files/udhcp-gcc-3.4.patch 261 MD5 516540b5ee269ebd9ff8aa7aa648b51f files/udhcp.init 994 diff --git a/net-misc/udhcp/files/udhcp-gcc-3.4.patch b/net-misc/udhcp/files/udhcp-gcc-3.4.patch new file mode 100644 index 000000000000..141435c8cf9a --- /dev/null +++ b/net-misc/udhcp/files/udhcp-gcc-3.4.patch @@ -0,0 +1,11 @@ +diff -Naur old/dhcpc.c new/dhcpc.c +--- old/dhcpc.c 2004-09-04 01:13:55.325759257 +0200 ++++ new/dhcpc.c 2004-09-04 01:13:36.004144921 +0200 +@@ -132,6 +132,7 @@ + state = INIT_SELECTING; + break; + case INIT_SELECTING: ++ break; + } + + /* start things over */ diff --git a/net-misc/udhcp/udhcp-0.9.8-r3.ebuild b/net-misc/udhcp/udhcp-0.9.8-r3.ebuild index 29bf15bde2a0..992182daba2a 100644 --- a/net-misc/udhcp/udhcp-0.9.8-r3.ebuild +++ b/net-misc/udhcp/udhcp-0.9.8-r3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/udhcp/udhcp-0.9.8-r3.ebuild,v 1.9 2004/07/01 22:06:12 squinky86 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/udhcp/udhcp-0.9.8-r3.ebuild,v 1.10 2004/09/04 00:33:24 morfic Exp $ -inherit eutils +inherit eutils gcc DESCRIPTION="udhcp Server/Client Package" HOMEPAGE="http://udhcp.busybox.net/" @@ -21,6 +21,17 @@ pkg_setup() { enewuser dhcp -1 /bin/false /var/lib/dhcp dhcp } +src_unpack() { + + unpack ${A} + cd ${S} + #fixes #62714, thanks GurliGebis + if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] + then + epatch ${FILESDIR}/udhcp-gcc-3.4.patch + fi +} + src_compile() { emake CROSS_COMPILE=${CHOST}- STRIP=true SYSLOG=1 || die } |