diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2016-08-28 20:47:47 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2016-08-28 20:48:46 +0200 |
| commit | 85ef4a41db344646dbb93d8583a231bc2058f0d6 (patch) | |
| tree | 54839e48af19d124a1ce72ae4411dd19d465f9f5 /app-admin | |
| parent | dev-libs/liblognorm: Dropping v1.1.3-r1 (diff) | |
| download | gentoo-85ef4a41db344646dbb93d8583a231bc2058f0d6.tar.gz gentoo-85ef4a41db344646dbb93d8583a231bc2058f0d6.tar.bz2 gentoo-85ef4a41db344646dbb93d8583a231bc2058f0d6.zip | |
app-admin/rsyslog: Restricting build depedencies for v8.16.0
While this version builds against =dev-libs/libfastjson-0.99.2 it does not
build against >dev-libs/libfastjson-0.99.2.
Additional, if you build rsyslog against dev-libs/json-c but build also against
dev-libs/liblognorm which was build against >dev-libs/libfastjson-0.99.2
you will get runtime errors.
To solve this problem we are restricting rsyslog-8.16.0 to build only against
dev-libs/json-c and also restricting to =dev-libs/liblognorm-1.1.2* (last
version which builds against dev-libs/json-c).
Package-Manager: portage-2.3.0
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-restrict-build-deps.patch | 55 | ||||
| -rw-r--r-- | app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild | 3 |
2 files changed, 57 insertions, 1 deletions
diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-restrict-build-deps.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-restrict-build-deps.patch new file mode 100644 index 000000000000..b28fbed062b8 --- /dev/null +++ b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-restrict-build-deps.patch @@ -0,0 +1,55 @@ +From ac9acbd9297cf986873e972968aca98d65377dab Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann +Date: Sun, 28 Aug 2016 20:08:58 +0200 +Subject: [PATCH 1/2] configure: Restrict to json-c usage + +--- + configure.ac | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4551c46..6789ab2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -26,10 +26,8 @@ PKG_PROG_PKG_CONFIG + + # modules we require + PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.9) +-PKG_CHECK_MODULES([JSON_C], [libfastjson],, [ +- PKG_CHECK_MODULES([JSON_C], [json],, [ +- PKG_CHECK_MODULES([JSON_C], [json-c],,) +- ]) ++PKG_CHECK_MODULES([JSON_C], [json],, [ ++ PKG_CHECK_MODULES([JSON_C], [json-c],,) + ]) + + save_CFLAGS="$CFLAGS" +-- +2.9.3 + + +From 7eed92763725244a53c50110fbe7419ba90d41a6 Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann +Date: Sun, 28 Aug 2016 20:15:32 +0200 +Subject: [PATCH 2/2] configure: Restrict to liblognorm-1.1.2 usage + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 6789ab2..5f29106 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -927,7 +927,7 @@ AC_ARG_ENABLE(mmnormalize, + [enable_mmnormalize=no] + ) + if test "x$enable_mmnormalize" = "xyes"; then +- PKG_CHECK_MODULES(LIBLOGNORM, lognorm >= 1.1.2) ++ PKG_CHECK_MODULES(LIBLOGNORM, lognorm = 1.1.2) + + save_CFLAGS="$CFLAGS" + save_LIBS="$LIBS" +-- +2.9.3 + diff --git a/app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild index 7716605706c0..49f44693dc44 100644 --- a/app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild @@ -16,6 +16,7 @@ PATCHES=( "${FILESDIR}"/8-stable/50-rsyslog-8.15.0-imfile-readmode2-vg-test-workaround.patch "${FILESDIR}"/8-stable/50-rsyslog-8.16.0-fix-queue-engine-issue-262.patch "${FILESDIR}"/8-stable/50-rsyslog-8.16.0-fix-leap-year-handling.patch + "${FILESDIR}"/8-stable/50-rsyslog-8.16.0-restrict-build-deps.patch ) if [[ ${PV} == "9999" ]]; then @@ -57,7 +58,7 @@ RDEPEND=" mysql? ( virtual/mysql ) normalize? ( >=dev-libs/libee-0.4.0 - >=dev-libs/liblognorm-1.1.2:= + =dev-libs/liblognorm-1.1.2*:= ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) |