diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-08-25 15:48:04 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-08-25 15:48:04 +0000 |
| commit | d693e25168937a487217d4e6e758e11c00d02b4a (patch) | |
| tree | b3692db1bf25f018d828e9501c8a87755b7c2a92 /sys-apps/systemd | |
| parent | EAPI 4. (diff) | |
| download | gentoo-2-d693e25168937a487217d4e6e758e11c00d02b4a.tar.gz gentoo-2-d693e25168937a487217d4e6e758e11c00d02b4a.tar.bz2 gentoo-2-d693e25168937a487217d4e6e758e11c00d02b4a.zip | |
Backport patch for USE=-lzma build failure. Bug #432700.
(Portage version: 2.2.0_alpha120_p33/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/systemd')
| -rw-r--r-- | sys-apps/systemd/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/systemd/files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch | 35 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-189.ebuild | 3 |
3 files changed, 43 insertions, 2 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index 118a6802f6be..a406cc9a5ef8 100644 --- a/sys-apps/systemd/ChangeLog +++ b/sys-apps/systemd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/systemd # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.42 2012/08/24 17:21:06 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.43 2012/08/25 15:48:04 mgorny Exp $ + + 25 Aug 2012; Michał Górny <mgorny@gentoo.org> + +files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch, + systemd-189.ebuild: + Backport patch for USE=-lzma build failure. Bug #432700. *systemd-189 (24 Aug 2012) diff --git a/sys-apps/systemd/files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch b/sys-apps/systemd/files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch new file mode 100644 index 000000000000..ea1b185236db --- /dev/null +++ b/sys-apps/systemd/files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch @@ -0,0 +1,35 @@ +From 70f09301d5d47577cfa4fe70c7b3cba336529cdf Mon Sep 17 00:00:00 2001 +From: Yin Kangkai <kangkai.yin@intel.com> +Date: Fri, 24 Aug 2012 16:52:58 +0800 +Subject: [PATCH] journal: add HAVE_XZ check to avoid build failure + +Without this, build fail with --disable-xz or xz not installed. +--- + src/journal/journal-verify.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c +index 2401293..5d134bd 100644 +--- a/src/journal/journal-verify.c ++++ b/src/journal/journal-verify.c +@@ -63,6 +63,7 @@ static int journal_file_object_verify(JournalFile *f, Object *o) { + h1 = le64toh(o->data.hash); + + if (o->object.flags & OBJECT_COMPRESSED) { ++#ifdef HAVE_XZ + void *b = NULL; + uint64_t alloc = 0, b_size; + +@@ -73,6 +74,9 @@ static int journal_file_object_verify(JournalFile *f, Object *o) { + + h2 = hash64(b, b_size); + free(b); ++#else ++ return -EPROTONOSUPPORT; ++#endif + } else + h2 = hash64(o->data.payload, le64toh(o->object.size) - offsetof(Object, data.payload)); + +-- +1.7.12 + diff --git a/sys-apps/systemd/systemd-189.ebuild b/sys-apps/systemd/systemd-189.ebuild index 0b8f28cb0266..291267d531e2 100644 --- a/sys-apps/systemd/systemd-189.ebuild +++ b/sys-apps/systemd/systemd-189.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-189.ebuild,v 1.1 2012/08/24 17:21:06 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-189.ebuild,v 1.2 2012/08/25 15:48:04 mgorny Exp $ EAPI=4 @@ -66,6 +66,7 @@ src_prepare() { local PATCHES=( "${FILESDIR}"/0001-Disable-udev-targets-for-udev-189.patch "${FILESDIR}"/0002-journald-add-missing-includes.patch + "${FILESDIR}"/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch ) autotools-utils_src_prepare |