pool/rsyslog
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 251464 from home:AndreasStieger:branches:Base:System

Browse Source 
- json-c provides a compatibility pkg-config for "json". Add 
  rsyslog-8.4.0-json-c-0.12-configure.patch to check for the
  required function directly.

OBS-URL: https://build.opensuse.org/request/show/251464
OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=203
This commit is contained in:
Andreas Stieger
2014-09-22 19:53:16 +00:00
committed by Git OBS Bridge
parent 34943c12f4
commit 931f9e5cc2
3 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
rsyslog-8.4.0-json-c-0.12-configure.patch Normal file
View File

@@ -0,0 +1,38 @@
From: Andreas Stieger <andreas.stieger@gmx.de>
Subject: [PATCH] fix build with json-c 0.12 if it provides a compatibility json.pc
Date: Mon, 22 Sep 2014 20:40:53 +0100
Upstream: submitting
References:
json-c on openSUSE provides a compatibility pkg-config for "json".
The autoconf check find it first, assuming it does not provide
the function json_tokener_error_desc. Check for availability of
function using AC_CHECK_FUNCS instead.
---
configure.ac | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
Index: rsyslog-8.4.0/configure.ac
===================================================================
--- rsyslog-8.4.0.orig/configure.ac 2014-08-18 10:41:34.000000000 +0100
+++ rsyslog-8.4.0/configure.ac 2014-09-22 20:34:18.000000000 +0100
@@ -32,14 +32,16 @@ PKG_PROG_PKG_CONFIG
PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.9)
PKG_CHECK_MODULES(LIBLOGGING_STDLOG, liblogging-stdlog >= 1.0.3)
PKG_CHECK_MODULES([JSON_C], [json],, [
- PKG_CHECK_MODULES([JSON_C], [json-c],
- [AC_DEFINE([HAVE_JSON_TOKENER_ERROR_DESC], [1], [we have the newer JSON-C API])])
+ PKG_CHECK_MODULES([JSON_C], [json-c],,)
])
# if int64 is supported, use it
AC_CHECK_LIB(json-c, json_object_new_object,,)
AC_CHECK_FUNCS(json_object_new_int64,,)
+# look for newer API
+AC_CHECK_FUNCS(json_tokener_error_desc,,)
+
case "${host}" in
*-*-linux*)
AC_DEFINE([OS_LINUX], [1], [Indicator for a Linux OS])

5
rsyslog.changes
View File

@@ -1,8 +1,11 @@
-------------------------------------------------------------------
Mon Sep 22 07:22:55 UTC 2014 - andreas.stieger@gmx.de
Mon Sep 22 19:50:42 UTC 2014 - andreas.stieger@gmx.de
- fix build with json-c 0.12 with upstream patch
rsyslog-8.4.0-json-c-0.12.patch
- json-c provides a compatibility pkg-config for "json". Add
rsyslog-8.4.0-json-c-0.12-configure.patch to check for the
required function directly.
-------------------------------------------------------------------
Wed Sep 17 09:40:40 UTC 2014 - wagner-thomas@gmx.at

9
rsyslog.spec
View File

@@ -90,6 +90,11 @@ BuildRequires: pkgconfig(libsystemd-journal) >= 197
Requires(pre): %insserv_prereq %fillup_prereq /etc/init.d/syslog
BuildRequires: klogd
%endif
# for Patch3 rsyslog-8.4.0-json-c-0.12-configure.patch
BuildRequires: autoconf >= 2.61
BuildRequires: automake
BuildRequires: libtool
#
BuildRequires: bison
BuildRequires: flex
BuildRequires: openssl-devel >= 0.9.7
@@ -187,6 +192,7 @@ Source15: rsyslog.firewall
Patch0: rsyslog-unit.patch
Patch1: rsyslog-8.4.0_implicit_declaration.patch
Patch2: rsyslog-8.4.0-json-c-0.12.patch
Patch3: rsyslog-8.4.0-json-c-0.12-configure.patch
# this is a dirty hack since % dir does only work for the specified directory and nothing above
# but I want to be able to switch this to /etc/apparmor.d once the profiles received more testing
@@ -484,6 +490,7 @@ This module provides support for ZeroMQ.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
#
%if %{with systemd}
for file in rsyslog-service-prepare; do
@@ -495,6 +502,8 @@ done
%endif
%build
# for Patch3 rsyslog-8.4.0-json-c-0.12-configure.patch
autoreconf -fiv
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../../grammar"
# needs java
# --enable-gui \