diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2016-10-02 02:05:45 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2016-10-02 02:09:29 -0700 |
| commit | e619ce061100a44dfd15a6cab2a3789c35ba1cc0 (patch) | |
| tree | e3e523c5986eef8dc0f11a288035f010a037d983 /app-emulation/rkt | |
| parent | dev-ruby/deep_merge: Stable for HPPA (bug #580108). (diff) | |
| download | gentoo-e619ce061100a44dfd15a6cab2a3789c35ba1cc0.tar.gz gentoo-e619ce061100a44dfd15a6cab2a3789c35ba1cc0.tar.bz2 gentoo-e619ce061100a44dfd15a6cab2a3789c35ba1cc0.zip | |
app-emulation/rkt: avoid sd-journal.h include for bug 595874
Package-Manager: portage-2.3.1
Diffstat (limited to 'app-emulation/rkt')
| -rw-r--r-- | app-emulation/rkt/rkt-1.15.0.ebuild | 6 | ||||
| -rw-r--r-- | app-emulation/rkt/rkt-1.16.0.ebuild | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/app-emulation/rkt/rkt-1.15.0.ebuild b/app-emulation/rkt/rkt-1.15.0.ebuild index 62861b0d55ce..70e3b76732f2 100644 --- a/app-emulation/rkt/rkt-1.15.0.ebuild +++ b/app-emulation/rkt/rkt-1.15.0.ebuild @@ -86,6 +86,12 @@ src_unpack() { src_prepare() { eapply_user + # avoid sdjournal include for bug 595874 + if ! use systemd; then + sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \ + -i rkt/rkt.mk || die + fi + sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die # disable git fetch of systemd diff --git a/app-emulation/rkt/rkt-1.16.0.ebuild b/app-emulation/rkt/rkt-1.16.0.ebuild index 62861b0d55ce..70e3b76732f2 100644 --- a/app-emulation/rkt/rkt-1.16.0.ebuild +++ b/app-emulation/rkt/rkt-1.16.0.ebuild @@ -86,6 +86,12 @@ src_unpack() { src_prepare() { eapply_user + # avoid sdjournal include for bug 595874 + if ! use systemd; then + sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \ + -i rkt/rkt.mk || die + fi + sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die # disable git fetch of systemd |