Attachment 851956 Details for Bug 1055049 – Build with $RPM_OPT_FLAGS, fix -debuginfo

[patch] Build with $RPM_OPT_FLAGS, fix -debuginfo

0001-Build-with-RPM_OPT_FLAGS-fix-debuginfo.patch (text/plain), 3.74 KB, created by Ville Skyttä on 2014-01-18 11:45:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-01-18 11:45:32 UTC

Size: 3.74 KB

patch

obsolete

>From 321f1410743faced2d0c70147e41303dbb33c559 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Sat, 18 Jan 2014 12:14:41 +0200
>Subject: [PATCH] Build with $RPM_OPT_FLAGS, fix -debuginfo.
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1055049
>---
> goaccess-0.7-cflags.patch | 61 +++++++++++++++++++++++++++++++++++++++++++++++
> goaccess.spec             | 11 +++++++--
> 2 files changed, 70 insertions(+), 2 deletions(-)
> create mode 100644 goaccess-0.7-cflags.patch
>
>diff --git a/goaccess-0.7-cflags.patch b/goaccess-0.7-cflags.patch
>new file mode 100644
>index 0000000..fcb4c61
>--- /dev/null
>+++ b/goaccess-0.7-cflags.patch
>@@ -0,0 +1,61 @@
>+diff -up goaccess-0.7/configure~ goaccess-0.7/configure
>+--- goaccess-0.7/configure~	2013-12-08 22:12:21.000000000 +0200
>++++ goaccess-0.7/configure	2013-12-08 22:12:21.000000000 +0200
>+@@ -3942,7 +3942,6 @@ else
>+   as_fn_error $? "libgeoip-dev is missing" "$LINENO" 5
>+ fi
>+ 
>+-   CFLAGS="-lGeoIP"
>+ fi
>+ 
>+ if test "$USE_UTF8" = "yes"; then
>+@@ -3993,7 +3992,6 @@ else
>+   as_fn_error $? "libncursesw5-dev is missing" "$LINENO" 5
>+ fi
>+ 
>+-   CFLAGS="-lncursesw"
>+ else
>+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for refresh in -lncurses" >&5
>+ $as_echo_n "checking for refresh in -lncurses... " >&6; }
>+@@ -4042,7 +4040,6 @@ else
>+   as_fn_error $? "libncurses5-dev is missing" "$LINENO" 5
>+ fi
>+ 
>+-   CFLAGS="-lncurses"
>+ fi
>+ 
>+ # pthread
>+@@ -4093,7 +4090,7 @@ else
>+   as_fn_error $? "pthread is missing" "$LINENO" 5
>+ fi
>+ 
>+-CFLAGS="-pthread"
>++CFLAGS="$CFLAGS -pthread"
>+ 
>+ # Checks for libraries.
>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for g_free in -lglib-2.0" >&5
>+diff -up goaccess-0.7/configure.ac~ goaccess-0.7/configure.ac
>+--- goaccess-0.7/configure.ac~	2013-12-08 22:12:14.000000000 +0200
>++++ goaccess-0.7/configure.ac	2013-12-08 22:12:14.000000000 +0200
>+@@ -24,20 +24,17 @@ AC_ARG_ENABLE(utf8,--enable-utf8 Enable
>+ 
>+ if test "$USE_GEOIP" = "yes"; then
>+    AC_CHECK_LIB([GeoIP], [GeoIP_new], [], [AC_MSG_ERROR([libgeoip-dev is missing])])
>+-   CFLAGS="-lGeoIP"
>+ fi
>+ 
>+ if test "$USE_UTF8" = "yes"; then
>+    AC_CHECK_LIB([ncursesw], [mvaddwstr], [], [AC_MSG_ERROR([libncursesw5-dev is missing])])
>+-   CFLAGS="-lncursesw"
>+ else
>+    AC_CHECK_LIB([ncurses], [refresh], [], [AC_MSG_ERROR([libncurses5-dev is missing])])
>+-   CFLAGS="-lncurses"
>+ fi
>+ 
>+ # pthread
>+ AC_CHECK_LIB([pthread], [pthread_create], [], [AC_MSG_ERROR([pthread is missing])])
>+-CFLAGS="-pthread"
>++CFLAGS="$CFLAGS -pthread"
>+ 
>+ # Checks for libraries.
>+ AC_CHECK_LIB([glib-2.0], [g_free], [], [AC_MSG_ERROR([glib-2.x is missing])])
>diff --git a/goaccess.spec b/goaccess.spec
>index 0b0737b..1cfe04c 100644
>--- a/goaccess.spec
>+++ b/goaccess.spec
>@@ -1,10 +1,12 @@
> Name:		goaccess		
> Version:	0.7
>-Release:	1%{?dist}
>+Release:	2%{?dist}
> Summary:	Apache Log Analyzer
> License:	GPLv2+	
> URL:		http://goaccess.prosoftcorp.com/
> Source0:	http://downloads.sourceforge.net/project/%{name}/%{version}/%{name}-%{version}.tar.gz
>+# https://github.com/allinurl/goaccess/pull/74
>+Patch0:		%{name}-0.7-cflags.patch
> BuildRequires:	ncurses-devel
> BuildRequires:	glib2-devel
> BuildRequires:	GeoIP-devel	
>@@ -16,9 +18,11 @@ for system administrators that require a visual server report on the fly.
> 
> %prep
> %setup -q
>+%patch0 -p1 -b .cflags
>+touch -r configure.ac.cflags configure.ac
> 
> %build
>-%configure --enable-geoip --enable-utf8
>+%configure --enable-debug --enable-geoip --enable-utf8
> make %{?_smp_mflags}
> 
> %install
>@@ -30,6 +34,9 @@ make install DESTDIR=%{buildroot}
> %{_mandir}/man1/%{name}.1*
> 
> %changelog
>+* Sat Jan 18 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 0.7-2
>+- Build with $RPM_OPT_FLAGS, fix -debuginfo.
>+
> * Wed Nov 20 2013 Eduardo Echeverria <echevemaster@gmail.com> - 0.7-1
> - Update to 0.7
> 
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1055049: 851943 | 851956