| 1 |
ercpe 14/06/04 16:47:40 |
| 2 |
|
| 3 |
Modified: 0.9.2-Makefile.patch |
| 4 |
Log: |
| 5 |
Fixed grok ebuild and patch. |
| 6 |
Thanks to jlec for actively monitoring commits and always helping me to fight my ignorance. |
| 7 |
|
| 8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 77C501ED) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 dev-libs/grok/files/0.9.2-Makefile.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/grok/files/0.9.2-Makefile.patch?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/grok/files/0.9.2-Makefile.patch?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/grok/files/0.9.2-Makefile.patch?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: 0.9.2-Makefile.patch |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/grok/files/0.9.2-Makefile.patch,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- 0.9.2-Makefile.patch 31 May 2014 12:59:09 -0000 1.1 |
| 24 |
+++ 0.9.2-Makefile.patch 4 Jun 2014 16:47:40 -0000 1.2 |
| 25 |
@@ -1,8 +1,43 @@ |
| 26 |
diff --git a/grok-0.9.2/Makefile b/grok-0.9.2/Makefile |
| 27 |
-index adfe869..d5531b2 100644 |
| 28 |
+index adfe869..fdced25 100644 |
| 29 |
--- a/grok-0.9.2/Makefile |
| 30 |
+++ b/grok-0.9.2/Makefile |
| 31 |
-@@ -97,6 +97,7 @@ install: libgrok.$(LIBSUFFIX) grok discogrok $(GROKHEADER) |
| 32 |
+@@ -25,10 +25,12 @@ else |
| 33 |
+ GPERF?=/usr/bin/gperf |
| 34 |
+ endif |
| 35 |
+ |
| 36 |
++LIBS=-lpcre -levent -rdynamic -ltokyocabinet |
| 37 |
++ |
| 38 |
+ # For linux, we need libdl for dlopen() |
| 39 |
+ # On FreeBSD, comment this line out. |
| 40 |
+ ifeq ($(PLATFORM), GNULinux) |
| 41 |
+-LDFLAGS+=-ldl |
| 42 |
++LIBS+=-ldl |
| 43 |
+ endif |
| 44 |
+ |
| 45 |
+ # ############################################# |
| 46 |
+@@ -41,8 +43,7 @@ VERSION=$(shell sh $(BASE)/version.sh) |
| 47 |
+ #CFLAGS+=-g |
| 48 |
+ #LDFLAGS+=-g |
| 49 |
+ |
| 50 |
+-CFLAGS+=-pipe -fPIC -I. -O2 |
| 51 |
+-LDFLAGS+=-lpcre -levent -rdynamic -ltokyocabinet |
| 52 |
++CFLAGS+=-fPIC -I. |
| 53 |
+ |
| 54 |
+ LIBSUFFIX=$(shell sh $(BASE)/platform.sh libsuffix) |
| 55 |
+ VERLIBSUFFIX=$(shell sh $(BASE)/platform.sh libsuffix $(MAJOR)) |
| 56 |
+@@ -50,8 +51,8 @@ DYNLIBFLAG=$(shell sh $(BASE)/platform.sh dynlibflag) |
| 57 |
+ LIBNAMEFLAG=$(shell sh $(BASE)/platform.sh libnameflag $(MAJOR) $(INSTALLLIB)) |
| 58 |
+ |
| 59 |
+ # Sane includes |
| 60 |
+-CFLAGS+=-I/usr/local/include |
| 61 |
+-LDFLAGS+=-L/usr/local/lib |
| 62 |
++#CFLAGS+=-I/usr/local/include |
| 63 |
++#LDFLAGS+=-L/usr/local/lib |
| 64 |
+ |
| 65 |
+ # Platform so we know what to dlopen |
| 66 |
+ CFLAGS+=-DPLATFORM_$(PLATFORM) |
| 67 |
+@@ -97,6 +98,7 @@ install: libgrok.$(LIBSUFFIX) grok discogrok $(GROKHEADER) |
| 68 |
install -m 755 grok $(DESTDIR)$(PREFIX)/bin |
| 69 |
install -m 755 discogrok $(DESTDIR)$(PREFIX)/bin |
| 70 |
install -m 644 libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib |
| 71 |
@@ -10,21 +45,21 @@ |
| 72 |
for header in $(GROKHEADER); do \ |
| 73 |
install -m 644 $$header $(DESTDIR)$(PREFIX)/include; \ |
| 74 |
done |
| 75 |
-@@ -162,14 +163,14 @@ cleanver: |
| 76 |
+@@ -162,14 +164,14 @@ cleanver: |
| 77 |
# Binary creation |
| 78 |
grok: LDFLAGS+=-levent |
| 79 |
grok: $(GROKOBJ) conf.tab.o conf.yy.o main.o grok_config.o |
| 80 |
- $(CC) $(LDFLAGS) $^ -o $@ |
| 81 |
-+ $(CC) $^ $(LDFLAGS) -o $@ |
| 82 |
++ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ |
| 83 |
|
| 84 |
discogrok: $(GROKOBJ) discover_main.o |
| 85 |
- $(CC) $(LDFLAGS) $^ -o $@ |
| 86 |
-+ $(CC) $^ $(LDFLAGS) -o $@ |
| 87 |
++ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ |
| 88 |
|
| 89 |
libgrok.$(LIBSUFFIX): |
| 90 |
libgrok.$(LIBSUFFIX): $(GROKOBJ) |
| 91 |
- $(CC) $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) $^ -o $@ |
| 92 |
-+ $(CC) $^ $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) -o $@ |
| 93 |
++ $(CC) $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) $^ $(LIBS) -o $@ |
| 94 |
|
| 95 |
libgrok.$(VERLIBSUFFIX): libgrok.$(LIBSUFFIX); |
| 96 |
ln -s $< $@ |
Archives