diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2017-05-22 15:42:58 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2017-05-22 15:43:58 +0200 |
| commit | 6cec5ed8f017a8d6869deaa00c6a364f2230d209 (patch) | |
| tree | 584b34aec0e8c412e07b9e15b0c840ac6d26469e /dev-libs/grok/files/grok-0.9.2-Makefile.patch | |
| parent | dev-libs/grok: Fix compilation against PCRE >=8.34 (diff) | |
| download | gentoo-6cec5ed8f017a8d6869deaa00c6a364f2230d209.tar.gz gentoo-6cec5ed8f017a8d6869deaa00c6a364f2230d209.tar.bz2 gentoo-6cec5ed8f017a8d6869deaa00c6a364f2230d209.zip | |
dev-libs/grok: Rev bump to allow building against >=gperf-3.1
Closes: https://github.com/jordansissel/grok/issues/29
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'dev-libs/grok/files/grok-0.9.2-Makefile.patch')
| -rw-r--r-- | dev-libs/grok/files/grok-0.9.2-Makefile.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/dev-libs/grok/files/grok-0.9.2-Makefile.patch b/dev-libs/grok/files/grok-0.9.2-Makefile.patch new file mode 100644 index 000000000000..8d9351c8c0f8 --- /dev/null +++ b/dev-libs/grok/files/grok-0.9.2-Makefile.patch @@ -0,0 +1,63 @@ +--- a/Makefile ++++ b/Makefile +@@ -25,10 +25,12 @@ else + GPERF?=/usr/bin/gperf + endif + ++LIBS=-lpcre -levent -rdynamic -ltokyocabinet ++ + # For linux, we need libdl for dlopen() + # On FreeBSD, comment this line out. + ifeq ($(PLATFORM), GNULinux) +-LDFLAGS+=-ldl ++LIBS+=-ldl + endif + + # ############################################# +@@ -41,8 +43,7 @@ VERSION=$(shell sh $(BASE)/version.sh) + #CFLAGS+=-g + #LDFLAGS+=-g + +-CFLAGS+=-pipe -fPIC -I. -O2 +-LDFLAGS+=-lpcre -levent -rdynamic -ltokyocabinet ++CFLAGS+=-fPIC -I. + + LIBSUFFIX=$(shell sh $(BASE)/platform.sh libsuffix) + VERLIBSUFFIX=$(shell sh $(BASE)/platform.sh libsuffix $(MAJOR)) +@@ -50,8 +51,8 @@ DYNLIBFLAG=$(shell sh $(BASE)/platform.sh dynlibflag) + LIBNAMEFLAG=$(shell sh $(BASE)/platform.sh libnameflag $(MAJOR) $(INSTALLLIB)) + + # Sane includes +-CFLAGS+=-I/usr/local/include +-LDFLAGS+=-L/usr/local/lib ++#CFLAGS+=-I/usr/local/include ++#LDFLAGS+=-L/usr/local/lib + + # Platform so we know what to dlopen + CFLAGS+=-DPLATFORM_$(PLATFORM) +@@ -97,6 +98,7 @@ install: libgrok.$(LIBSUFFIX) grok discogrok $(GROKHEADER) + install -m 755 grok $(DESTDIR)$(PREFIX)/bin + install -m 755 discogrok $(DESTDIR)$(PREFIX)/bin + install -m 644 libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib ++ ln -s libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib/libgrok.$(LIBSUFFIX).1 + for header in $(GROKHEADER); do \ + install -m 644 $$header $(DESTDIR)$(PREFIX)/include; \ + done +@@ -162,14 +164,14 @@ cleanver: + # Binary creation + grok: LDFLAGS+=-levent + grok: $(GROKOBJ) conf.tab.o conf.yy.o main.o grok_config.o +- $(CC) $(LDFLAGS) $^ -o $@ ++ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ + + discogrok: $(GROKOBJ) discover_main.o +- $(CC) $(LDFLAGS) $^ -o $@ ++ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ + + libgrok.$(LIBSUFFIX): + libgrok.$(LIBSUFFIX): $(GROKOBJ) +- $(CC) $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) $^ -o $@ ++ $(CC) $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) $^ $(LIBS) -o $@ + + libgrok.$(VERLIBSUFFIX): libgrok.$(LIBSUFFIX); + ln -s $< $@ |