jer 14/11/22 12:34:41
Added: goaccess-0.6.1-CFLAGS.patch
goaccess-0.6.1-tinfo.patch
Log:
Fix building against sys-libs/ncurses[tinfo] (bug #528364).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
A792A613)
Revision Changes Path
1.1 net-analyzer/goaccess/files/goaccess-0.6.1-CFLAGS.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/goaccess/files/goaccess-0.6.1-CFLAGS.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/goaccess/files/goaccess-0.6.1-CFLAGS.patch?rev=1.1&content-type=text/plain
Index: goaccess-0.6.1-CFLAGS.patch
===================================================================
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,6 @@
bin_PROGRAMS = goaccess
goaccess_SOURCES = output.c output.h settings.c settings.h error.c error.h
xmalloc.c xmalloc.h commons.c commons.h goaccess.c parser.c parser.h ui.c ui.h
util.c util.h gdashboard.c gdashboard.h gdns.c gdns.h gmenu.c gmenu.h goaccess.h
-AM_CFLAGS = -g -Wall @GLIB2_CFLAGS@
+AM_CFLAGS = -Wall @GLIB2_CFLAGS@
goaccess_LDADD = -lm
dist_man_MANS = goaccess.1
1.1 net-analyzer/goaccess/files/goaccess-0.6.1-tinfo.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/goaccess/files/goaccess-0.6.1-tinfo.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/goaccess/files/goaccess-0.6.1-tinfo.patch?rev=1.1&content-type=text/plain
Index: goaccess-0.6.1-tinfo.patch
===================================================================
--- a/configure.ac
+++ b/configure.ac
@@ -19,22 +19,20 @@
AC_ARG_ENABLE(geoip,--enable-geoip Enable GeoIP country lookup,
USE_GEOIP="yes")
AC_ARG_ENABLE(utf8,--enable-utf8 Enable UTF-8 support for wide characters,
USE_UTF8="yes")
-if test "$USE_GEOIP" = "yes"; then
- AC_CHECK_LIB([GeoIP], [GeoIP_new], [], [AC_MSG_ERROR([libgeoip-dev is
missing])])
- CFLAGS="-lGeoIP"
+if test x"$USE_GEOIP" = "xyes"; then
+ AC_CHECK_LIB([GeoIP], [GeoIP_new], , [AC_MSG_ERROR([libgeoip-dev is
missing])])
fi
-if test "$USE_UTF8" = "yes"; then
- AC_CHECK_LIB([ncursesw], [mvaddwstr], [], [AC_MSG_ERROR([libncursesw5-dev
is missing])])
- CFLAGS="-lncursesw"
+if test x"$USE_UTF8" = "xyes"; then
+ AC_CHECK_LIB([ncursesw], [mvaddwstr], , [AC_MSG_ERROR([libncursesw5-dev is
missing])])
+ AC_SEARCH_LIBS([stdscr], [tinfow], ,[AC_MSG_ERROR([Cannot find a library
providing stdscr])])
else
- AC_CHECK_LIB([ncurses], [refresh], [], [AC_MSG_ERROR([libncurses5-dev is
missing])])
- CFLAGS="-lncurses"
+ AC_CHECK_LIB([ncurses], [refresh], , [AC_MSG_ERROR([libncurses5-dev is
missing])])
+ AC_SEARCH_LIBS([stdscr], [tinfo], ,[AC_MSG_ERROR([Cannot find a library
providing stdscr])])
fi
# pthread
AC_CHECK_LIB([pthread], [pthread_create], [], [AC_MSG_ERROR([pthread is
missing])])
-CFLAGS="-pthread"
# Checks for libraries.
AC_CHECK_LIB([glib-2.0], [g_free], [], [AC_MSG_ERROR([glib-2.x is missing])])
