diff options
| author |   Tony Vroon <chainsaw@gentoo.org> | 2008-07-04 14:46:07 +0000 |
|---|---|---|
| committer | Tony Vroon <chainsaw@gentoo.org> | 2008-07-04 14:46:07 +0000 |
| commit | 5d5cb874d1f493027a3a8bcc13b729a9ac3ebb0b (patch) | |
| tree | 1348ea9c78832f07dcfa39da370c65882d09a1d9 | |
| parent | Version bump, remove old versions. (diff) | |
| download | gentoo-2-5d5cb874d1f493027a3a8bcc13b729a9ac3ebb0b.tar.gz gentoo-2-5d5cb874d1f493027a3a8bcc13b729a9ac3ebb0b.tar.bz2 gentoo-2-5d5cb874d1f493027a3a8bcc13b729a9ac3ebb0b.zip | |
Linking fix, trapmon failed to link if net-snmp was installed on the system. No revision bump, if this applied to you then your build broke.
(Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc8-00204-gc461a97-dirty x86_64)
| -rw-r--r-- | net-analyzer/snips/ChangeLog | 7 | ||||
| -rw-r--r-- | net-analyzer/snips/files/snips-1.2-link-correct-snmp-lib.patch | 12 | ||||
| -rw-r--r-- | net-analyzer/snips/snips-1.2-r2.ebuild | 3 |
3 files changed, 20 insertions, 2 deletions
diff --git a/net-analyzer/snips/ChangeLog b/net-analyzer/snips/ChangeLog index 5a2f4c8e4c6c..866c35709adc 100644 --- a/net-analyzer/snips/ChangeLog +++ b/net-analyzer/snips/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-analyzer/snips # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snips/ChangeLog,v 1.3 2008/07/04 11:43:40 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snips/ChangeLog,v 1.4 2008/07/04 14:46:06 chainsaw Exp $ + + 04 Jul 2008; <chainsaw@gentoo.org> + +files/snips-1.2-link-correct-snmp-lib.patch, snips-1.2-r2.ebuild: + Linking fix, trapmon failed to link if net-snmp was installed on the + system. No revision bump, if this applied to you then your build broke. *snips-1.2-r2 (04 Jul 2008) diff --git a/net-analyzer/snips/files/snips-1.2-link-correct-snmp-lib.patch b/net-analyzer/snips/files/snips-1.2-link-correct-snmp-lib.patch new file mode 100644 index 000000000000..23098c02d3ff --- /dev/null +++ b/net-analyzer/snips/files/snips-1.2-link-correct-snmp-lib.patch @@ -0,0 +1,12 @@ +diff -uNr snips-1.2.ORIG/trapmon/Makefile.mid snips-1.2/trapmon/Makefile.mid +--- snips-1.2.ORIG/trapmon/Makefile.mid 2008-07-04 15:39:00.000000000 +0100 ++++ snips-1.2/trapmon/Makefile.mid 2008-07-04 15:39:22.000000000 +0100 +@@ -17,7 +17,7 @@ + INITFILES = trapmon + + $(TARG): $(OBJS) Makefile +- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ ++ $(CC) $(CFLAGS) $(OBJS) $(PROGLIBS) $(LIBS) -o $@ + + install: $(TARG) + $(INSTALL) -c -m 4750 $(TARG) $(DESTDIR)$(BINDIR)/ diff --git a/net-analyzer/snips/snips-1.2-r2.ebuild b/net-analyzer/snips/snips-1.2-r2.ebuild index b7ada4165bdb..1357e365277b 100644 --- a/net-analyzer/snips/snips-1.2-r2.ebuild +++ b/net-analyzer/snips/snips-1.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snips/snips-1.2-r2.ebuild,v 1.1 2008/07/04 11:43:40 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snips/snips-1.2-r2.ebuild,v 1.2 2008/07/04 14:46:06 chainsaw Exp $ inherit eutils toolchain-funcs @@ -35,6 +35,7 @@ src_unpack() { epatch "${FILESDIR}/${P}-conflicting-types.patch" epatch "${FILESDIR}/${P}-code-ordering.patch" epatch "${FILESDIR}/${P}-destdir-awareness.patch" + epatch "${FILESDIR}/${P}-link-correct-snmp-lib.patch" } src_compile() { |