[gentoo-commits] gentoo-x86 commit in net-libs/libtrace/files: libtrace-3.0.20-libwandio-linking.patch libtrace-3.0.20-no-examples.patch libtrace-3.0.20-autoconf-1.13.patch libtrace-3.0.20-tinfo.patch

[Jeroen Roovers (jer)]

jer         14/07/09 13:32:44

  Added:                libtrace-3.0.20-libwandio-linking.patch
                        libtrace-3.0.20-no-examples.patch
                        libtrace-3.0.20-autoconf-1.13.patch
                        libtrace-3.0.20-tinfo.patch
  Log:
  Version bump. Fix linking tracetop against sys-libs/ncurses[tinfo]. Fix parallel make issue building wandiocat.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.1                  net-libs/libtrace/files/libtrace-3.0.20-libwandio-linking.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libtrace/files/libtrace-3.0.20-libwandio-linking.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libtrace/files/libtrace-3.0.20-libwandio-linking.patch?rev=1.1&content-type=text/plain

Index: libtrace-3.0.20-libwandio-linking.patch
===================================================================
--- a/libwandio/Makefile.am
+++ b/libwandio/Makefile.am
@@ -43,3 +43,5 @@
 wandiocat_CFLAGS = -I"$(top_srcdir)/libwandio"
 wandiocat_CXXFLAGS = -I"$(top_srcdir)/libwandio"
 wandiocat_LDFLAGS = -L"$(top_srcdir)/libwandio" -lwandio
+
+wandiocat: libwandio.la



1.1                  net-libs/libtrace/files/libtrace-3.0.20-no-examples.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libtrace/files/libtrace-3.0.20-no-examples.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libtrace/files/libtrace-3.0.20-no-examples.patch?rev=1.1&content-type=text/plain

Index: libtrace-3.0.20-no-examples.patch
===================================================================
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 LIBPACKETDUMP_DIR = libpacketdump
 TOOLS_DIR = tools
 WANDIO_DIR=libwandio
-SUBDIRS = $(WANDIO_DIR) lib $(LIBPACKETDUMP_DIR) $(TOOLS_DIR) docs examples
+SUBDIRS = $(WANDIO_DIR) lib $(LIBPACKETDUMP_DIR) $(TOOLS_DIR) docs 
 
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = 1.9 foreign



1.1                  net-libs/libtrace/files/libtrace-3.0.20-autoconf-1.13.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libtrace/files/libtrace-3.0.20-autoconf-1.13.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libtrace/files/libtrace-3.0.20-autoconf-1.13.patch?rev=1.1&content-type=text/plain

Index: libtrace-3.0.20-autoconf-1.13.patch
===================================================================
--- a/configure.in
+++ b/configure.in
@@ -61,7 +61,7 @@
 ])
 
 # Put all our automake definitions in config.h
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 
 # Checks for C and C++ compilers
 AC_PROG_CC



1.1                  net-libs/libtrace/files/libtrace-3.0.20-tinfo.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libtrace/files/libtrace-3.0.20-tinfo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libtrace/files/libtrace-3.0.20-tinfo.patch?rev=1.1&content-type=text/plain

Index: libtrace-3.0.20-tinfo.patch
===================================================================
--- a/tools/tracetop/Makefile.am
+++ b/tools/tracetop/Makefile.am
@@ -6,6 +6,6 @@
 include ../Makefile.tools
 
 tracetop_SOURCES = tracetop.cc
-tracetop_LDADD = -lncurses 
+tracetop_LDADD = @ncurses_LIBS@ 
 tracetop_CPPFLAGS = -fno-strict-aliasing $(AM_CFLAGS)
 endif
--- a/configure.in
+++ b/configure.in
@@ -492,6 +492,8 @@
 	fi
 fi
 
+PKG_CHECK_MODULES(ncurses,ncurses)
+
 AC_ARG_WITH([ncurses],
 	AC_HELP_STRING([--with-ncurses], [build tracetop (requires ncurses)]))