Accepting request 681661 from home:dimstar:Factory
- Add rsyslog-pgsql-pkg-config.patch: use pkgconfig to find the right libraries/directories for postgresql. According to pgsql upstream, pg_config must only be used to buildpgsql modules. Makes it usable with pgsql 11 OBS-URL: https://build.opensuse.org/request/show/681661 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=307
This commit is contained in:
parent
31c71eb89b
commit
2c6180e7a5
30
rsyslog-pgsql-pkg-config.patch
Normal file
30
rsyslog-pgsql-pkg-config.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
Index: rsyslog-8.39.0/configure.ac
|
||||||
|
===================================================================
|
||||||
|
--- rsyslog-8.39.0.orig/configure.ac
|
||||||
|
+++ rsyslog-8.39.0/configure.ac
|
||||||
|
@@ -794,24 +794,7 @@ AC_ARG_ENABLE(pgsql,
|
||||||
|
[enable_pgsql=no]
|
||||||
|
)
|
||||||
|
if test "x$enable_pgsql" = "xyes"; then
|
||||||
|
- AC_CHECK_PROG(
|
||||||
|
- [PG_CONFIG],
|
||||||
|
- [pg_config],
|
||||||
|
- [pg_config],
|
||||||
|
- [no],,,
|
||||||
|
- )
|
||||||
|
- if test "x${PG_CONFIG}" = "xno"; then
|
||||||
|
- AC_MSG_FAILURE([pg_config not found])
|
||||||
|
- fi
|
||||||
|
- AC_CHECK_LIB(
|
||||||
|
- [pq],
|
||||||
|
- [PQconnectdb],
|
||||||
|
- [PGSQL_CFLAGS="-I`$PG_CONFIG --includedir`"
|
||||||
|
- PGSQL_LIBS="-L`$PG_CONFIG --libdir` -lpq"
|
||||||
|
- ],
|
||||||
|
- [AC_MSG_FAILURE([PgSQL library is missing])],
|
||||||
|
- [-L`$PG_CONFIG --libdir`]
|
||||||
|
- )
|
||||||
|
+ PKG_CHECK_MODULES([PGSQL], [libpq])
|
||||||
|
fi
|
||||||
|
AM_CONDITIONAL(ENABLE_PGSQL, test x$enable_pgsql = xyes)
|
||||||
|
AC_SUBST(PGSQL_CFLAGS)
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Mar 5 09:45:52 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
- Add rsyslog-pgsql-pkg-config.patch: use pkgconfig to find the
|
||||||
|
right libraries/directories for postgresql. According to pgsql
|
||||||
|
upstream, pg_config must only be used to buildpgsql modules.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Feb 22 11:47:22 UTC 2019 - Thomas.Blume@suse.com
|
Fri Feb 22 11:47:22 UTC 2019 - Thomas.Blume@suse.com
|
||||||
|
|
||||||
|
@ -238,6 +238,7 @@ Source19: NetworkManager.frule
|
|||||||
|
|
||||||
# PATCH-FIX-OPENSUSE rsyslog-unit.patch crrodriguez@opensuse.org Customize upstream systemd unit for openSUSE needs.
|
# PATCH-FIX-OPENSUSE rsyslog-unit.patch crrodriguez@opensuse.org Customize upstream systemd unit for openSUSE needs.
|
||||||
Patch0: rsyslog-unit.patch
|
Patch0: rsyslog-unit.patch
|
||||||
|
Patch1: rsyslog-pgsql-pkg-config.patch
|
||||||
|
|
||||||
# this is a dirty hack since % dir does only work for the specified directory and nothing above
|
# 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
|
# but I want to be able to switch this to /etc/apparmor.d once the profiles received more testing
|
||||||
@ -569,6 +570,7 @@ This module provides an output module for TCL.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -a 14
|
%setup -q -a 14
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
#
|
#
|
||||||
%if %{with systemd}
|
%if %{with systemd}
|
||||||
for file in rsyslog-service-prepare; do
|
for file in rsyslog-service-prepare; do
|
||||||
|
Loading…
Reference in New Issue
Block a user