diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-10-14 19:35:12 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-10-14 19:35:12 +0000 |
| commit | b63069bcfb282fe39debdcf481b70e151a85e80f (patch) | |
| tree | 95efb947336529b649d215de54edef42744c26bf /sys-apps/iproute2 | |
| parent | Stable on Alpha. (diff) | |
| download | gentoo-2-b63069bcfb282fe39debdcf481b70e151a85e80f.tar.gz gentoo-2-b63069bcfb282fe39debdcf481b70e151a85e80f.tar.bz2 gentoo-2-b63069bcfb282fe39debdcf481b70e151a85e80f.zip | |
Fixup genl subdir #151307 by Maarten Maathuis.
(Portage version: 2.1.2_pre2-r9)
Diffstat (limited to 'sys-apps/iproute2')
| -rw-r--r-- | sys-apps/iproute2/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/iproute2/files/iproute2-2.6.18.20061002-genl.patch | 22 | ||||
| -rw-r--r-- | sys-apps/iproute2/iproute2-2.6.18.20061002.ebuild | 7 |
3 files changed, 31 insertions, 5 deletions
diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog index 9b0c4e5eb2a0..e9e2b11f661c 100644 --- a/sys-apps/iproute2/ChangeLog +++ b/sys-apps/iproute2/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/iproute2 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.61 2006/10/14 13:34:23 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.62 2006/10/14 19:35:12 vapier Exp $ + + 14 Oct 2006; Mike Frysinger <vapier@gentoo.org> + +files/iproute2-2.6.18.20061002-genl.patch, + iproute2-2.6.18.20061002.ebuild: + Fixup genl subdir #151307 by Maarten Maathuis. 14 Oct 2006; <nixnut@gentoo.org> iproute2-2.6.16.20060323.ebuild: Stable on ppc wrt bug 151249 diff --git a/sys-apps/iproute2/files/iproute2-2.6.18.20061002-genl.patch b/sys-apps/iproute2/files/iproute2-2.6.18.20061002-genl.patch new file mode 100644 index 000000000000..a1684b3cc8f2 --- /dev/null +++ b/sys-apps/iproute2/files/iproute2-2.6.18.20061002-genl.patch @@ -0,0 +1,22 @@ +http://bugs.gentoo.org/151307 + +--- iproute2-2.6.18-061002/genl/Makefile ++++ iproute2-2.6.18-061002/genl/Makefile +@@ -7,14 +7,15 @@ + + GENLLIB := + ++LDLIBS += -lm -ldl +-LDFLAGS += -Wl,-export-dynamic -lm -ldl ++LDFLAGS += -Wl,-export-dynamic + + all: genl + + genl: $(GENLOBJ) $(LIBNETLINK) $(LIBUTIL) $(GENLLIB) + + install: all +- install -m 0755 -s genl $(DESTDIR)$(SBINDIR) ++ install -m 0755 genl $(DESTDIR)$(SBINDIR) + + clean: + rm -f $(GENLOBJ) $(GENLLIB) genl diff --git a/sys-apps/iproute2/iproute2-2.6.18.20061002.ebuild b/sys-apps/iproute2/iproute2-2.6.18.20061002.ebuild index b27c1b2100cc..aa57dedff5d4 100644 --- a/sys-apps/iproute2/iproute2-2.6.18.20061002.ebuild +++ b/sys-apps/iproute2/iproute2-2.6.18.20061002.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/iproute2/iproute2-2.6.18.20061002.ebuild,v 1.1 2006/10/14 01:33:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.18.20061002.ebuild,v 1.2 2006/10/14 19:35:12 vapier Exp $ inherit eutils toolchain-funcs @@ -39,6 +39,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-2.6.16.20060323-build.patch #137574 epatch "${FILESDIR}"/${PN}-2.6.16.20060323-routef-safe.patch #139853 + epatch "${FILESDIR}"/${PN}-2.6.18.20061002-genl.patch #151307 #68948 - esfq/wrr patches epatch "${FILESDIR}"/${PN}-051007-esfq-2.6.13.patch @@ -61,12 +62,10 @@ src_compile() { && echo 'y' >> Config \ || echo 'n' >> Config - local SUBDIRS="lib ip tc misc netem" - use minimal && SUBDIRS="lib tc" + use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile emake \ CC="$(tc-getCC)" \ AR="$(tc-getAR)" \ - SUBDIRS="${SUBDIRS}" \ || die "make" } |