diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2017-05-22 15:17:28 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2017-05-22 15:43:56 +0200 |
| commit | 0bdc0027d77f551be490f7811702a45b5cd6405c (patch) | |
| tree | 5ed9e4830347c7aa6d97fa3b22f092eafb123490 /dev-libs | |
| parent | sys-kernel/linux-firmware: amd64 stable wrt bug #619358 (diff) | |
| download | gentoo-0bdc0027d77f551be490f7811702a45b5cd6405c.tar.gz gentoo-0bdc0027d77f551be490f7811702a45b5cd6405c.tar.bz2 gentoo-0bdc0027d77f551be490f7811702a45b5cd6405c.zip | |
dev-libs/grok: Fix compilation against PCRE >=8.34
In addition, <dev-util/gperf-3.1 dependency was added.
Link: https://github.com/jordansissel/grok/issues/29
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/grok/files/0.9.2-build-with-pcre-lt-8.34.patch | 15 | ||||
| -rw-r--r-- | dev-libs/grok/grok-0.9.2.ebuild | 6 |
2 files changed, 19 insertions, 2 deletions
diff --git a/dev-libs/grok/files/0.9.2-build-with-pcre-lt-8.34.patch b/dev-libs/grok/files/0.9.2-build-with-pcre-lt-8.34.patch new file mode 100644 index 000000000000..1593ac309817 --- /dev/null +++ b/dev-libs/grok/files/0.9.2-build-with-pcre-lt-8.34.patch @@ -0,0 +1,15 @@ +https://github.com/jordansissel/grok/commit/44ce9372a29319c01d4ac7f24287fb36315e0e34 + +--- a/grokre.c ++++ b/grokre.c +@@ -12,8 +12,8 @@ + + /* global, static variables */ + +-#define CAPTURE_ID_LEN 4 +-#define CAPTURE_FORMAT "%04x" ++#define CAPTURE_ID_LEN 5 ++#define CAPTURE_FORMAT "_%04x" + + /* internal functions */ + static char *grok_pattern_expand(grok_t *grok); //, int offset, int length); diff --git a/dev-libs/grok/grok-0.9.2.ebuild b/dev-libs/grok/grok-0.9.2.ebuild index e7a4e05d10e9..1981d7238fac 100644 --- a/dev-libs/grok/grok-0.9.2.ebuild +++ b/dev-libs/grok/grok-0.9.2.ebuild @@ -15,11 +15,13 @@ KEYWORDS="amd64 arm hppa x86" IUSE="" -DEPEND="dev-db/tokyocabinet +CDEPEND="dev-db/tokyocabinet >=dev-libs/libevent-1.3:= >=dev-libs/libpcre-7.6" -RDEPEND="${DEPEND}" +RDEPEND="${CDEPEND}" +DEPEND="${CDEPEND} + <dev-util/gperf-3.1" src_prepare() { epatch "${FILESDIR}"/${PV}-*.patch |