diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-05-04 12:02:00 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-05-04 12:02:00 +0100 |
commit | eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch) | |
tree | ce35c6d01b5ff5de95c3a20fef853b9a6518ad2e /dev-libs/grok/files/grok-0.9.2-Makefile.patch | |
parent | b7ebc951da8800f711142f69d9d958bde67a112d (diff) |
gentoo resync : 04.05.2019
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, 0 insertions, 63 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 deleted file mode 100644 index 8d9351c8c0f8..000000000000 --- a/dev-libs/grok/files/grok-0.9.2-Makefile.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- 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 $< $@ |