diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2018-02-10 00:16:41 +0100 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2018-02-10 00:21:26 +0100 |
| commit | cd2e1aa22d7d3e899a09d74030bc785fac170d53 (patch) | |
| tree | 5e70870f7285d1744dc0927e7e00ae1223db3c66 /app-admin/rsyslog | |
| parent | app-office/libreoffice-l10n: Drop 6.0.0.3 (diff) | |
| download | gentoo-cd2e1aa22d7d3e899a09d74030bc785fac170d53.tar.gz gentoo-cd2e1aa22d7d3e899a09d74030bc785fac170d53.tar.bz2 gentoo-cd2e1aa22d7d3e899a09d74030bc785fac170d53.zip | |
app-admin/rsyslog: Fix building without net-misc/curl
Previous patch was incomplete and missed a header include.
Closes: https://bugs.gentoo.org/646262
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --force
Diffstat (limited to 'app-admin/rsyslog')
| -rw-r--r-- | app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch (renamed from app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r2.patch) | 14 | ||||
| -rw-r--r-- | app-admin/rsyslog/rsyslog-8.32.0-r3.ebuild (renamed from app-admin/rsyslog/rsyslog-8.32.0-r2.ebuild) | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r2.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch index 23a189d03093..534183a8ca29 100644 --- a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r2.patch +++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch @@ -121,3 +121,17 @@ https://github.com/rsyslog/rsyslog/commit/50205ced0fc22e74f26f2a07b557b69c5d30e1 omelasticsearch_la_LDFLAGS = -module -avoid-version omelasticsearch_la_LIBADD = $(CURL_LIBS) $(LIBM) +--- a/grammar/rainerscript.c ++++ b/grammar/rainerscript.c +@@ -36,7 +36,11 @@ + #include <sys/types.h> + #include <libestr.h> + #include <time.h> ++ ++#ifdef HAVE_LIBCURL + #include <curl/curl.h> ++#endif ++ + #include "rsyslog.h" + #include "rainerscript.h" + #include "conf.h" diff --git a/app-admin/rsyslog/rsyslog-8.32.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.32.0-r3.ebuild index 71638d76e217..33668a1674d2 100644 --- a/app-admin/rsyslog/rsyslog-8.32.0-r2.ebuild +++ b/app-admin/rsyslog/rsyslog-8.32.0-r3.ebuild @@ -48,7 +48,7 @@ else doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) " - PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.32.0-fix-building-without-curl-r2.patch ) + PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.32.0-fix-building-without-curl-r3.patch ) fi LICENSE="GPL-3 LGPL-3 Apache-2.0" |