ercpe 14/06/04 16:47:40 Modified: 0.9.2-Makefile.patch Log: Fixed grok ebuild and patch. Thanks to jlec for actively monitoring commits and always helping me to fight my ignorance. (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)
Revision Changes Path 1.2 dev-libs/grok/files/0.9.2-Makefile.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/grok/files/0.9.2-Makefile.patch?rev=1.2&view=markup 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 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/grok/files/0.9.2-Makefile.patch?r1=1.1&r2=1.2 Index: 0.9.2-Makefile.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/grok/files/0.9.2-Makefile.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 0.9.2-Makefile.patch 31 May 2014 12:59:09 -0000 1.1 +++ 0.9.2-Makefile.patch 4 Jun 2014 16:47:40 -0000 1.2 @@ -1,8 +1,43 @@ diff --git a/grok-0.9.2/Makefile b/grok-0.9.2/Makefile -index adfe869..d5531b2 100644 +index adfe869..fdced25 100644 --- a/grok-0.9.2/Makefile +++ b/grok-0.9.2/Makefile -@@ -97,6 +97,7 @@ install: libgrok.$(LIBSUFFIX) grok discogrok $(GROKHEADER) +@@ -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 @@ -10,21 +45,21 @@ for header in $(GROKHEADER); do \ install -m 644 $$header $(DESTDIR)$(PREFIX)/include; \ done -@@ -162,14 +163,14 @@ cleanver: +@@ -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) -o $@ ++ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ discogrok: $(GROKOBJ) discover_main.o - $(CC) $(LDFLAGS) $^ -o $@ -+ $(CC) $^ $(LDFLAGS) -o $@ ++ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ libgrok.$(LIBSUFFIX): libgrok.$(LIBSUFFIX): $(GROKOBJ) - $(CC) $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) $^ -o $@ -+ $(CC) $^ $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) -o $@ ++ $(CC) $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) $^ $(LIBS) -o $@ libgrok.$(VERLIBSUFFIX): libgrok.$(LIBSUFFIX); ln -s $< $@
