diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
commit | d87262dd706fec50cd150aab3e93883b6337466d (patch) | |
tree | 246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-benchmarks/wrk/files | |
parent | 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-benchmarks/wrk/files')
-rw-r--r-- | app-benchmarks/wrk/files/wrk-3.1.1-makefile.patch | 54 | ||||
-rw-r--r-- | app-benchmarks/wrk/files/wrk-4.1.0-makefile.patch | 31 |
2 files changed, 0 insertions, 85 deletions
diff --git a/app-benchmarks/wrk/files/wrk-3.1.1-makefile.patch b/app-benchmarks/wrk/files/wrk-3.1.1-makefile.patch deleted file mode 100644 index 595c69ac1572..000000000000 --- a/app-benchmarks/wrk/files/wrk-3.1.1-makefile.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git i/Makefile w/Makefile -index d956c6b..48be677 100644 ---- i/Makefile -+++ w/Makefile -@@ -1,4 +1,4 @@ --CFLAGS := -std=c99 -Wall -O2 -D_REENTRANT -+CFLAGS += -std=c99 -Wall -D_REENTRANT - LIBS := -lpthread -lm -lcrypto -lssl - - TARGET := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown) -@@ -23,38 +23,31 @@ BIN := wrk - ODIR := obj - OBJ := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o - --LDIR = deps/luajit/src --LIBS := -lluajit $(LIBS) --CFLAGS += -I$(LDIR) --LDFLAGS += -L$(LDIR) -+LIBS := $(shell pkg-config --libs luajit) $(LIBS) -+CFLAGS += $(shell pkg-config --cflags luajit) - - all: $(BIN) - - clean: - $(RM) $(BIN) obj/* -- @$(MAKE) -C deps/luajit clean - - $(BIN): $(OBJ) - @echo LINK $(BIN) -- @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -+ @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) - --$(OBJ): config.h Makefile $(LDIR)/libluajit.a | $(ODIR) -+$(OBJ): config.h Makefile | $(ODIR) - - $(ODIR): - @mkdir -p $@ - - $(ODIR)/bytecode.o: src/wrk.lua - @echo LUAJIT $< -- @$(SHELL) -c 'cd $(LDIR) && ./luajit -b $(CURDIR)/$< $(CURDIR)/$@' -+ @$(SHELL) -c 'luajit -b $(CURDIR)/$< $(CURDIR)/$@' - - $(ODIR)/%.o : %.c - @echo CC $< - @$(CC) $(CFLAGS) -c -o $@ $< - --$(LDIR)/libluajit.a: -- @echo Building LuaJIT... -- @$(MAKE) -C $(LDIR) BUILDMODE=static -- - .PHONY: all clean - .SUFFIXES: - .SUFFIXES: .c .o .lua diff --git a/app-benchmarks/wrk/files/wrk-4.1.0-makefile.patch b/app-benchmarks/wrk/files/wrk-4.1.0-makefile.patch deleted file mode 100644 index 6f091accca56..000000000000 --- a/app-benchmarks/wrk/files/wrk-4.1.0-makefile.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- Makefile.orig 2018-01-21 01:00:58.000000000 -0500 -+++ Makefile 2018-02-15 22:03:01.565862308 -0500 -@@ -1,4 +1,4 @@ --CFLAGS += -std=c99 -Wall -O2 -D_REENTRANT -+CFLAGS += -std=c99 -Wall -D_REENTRANT - LIBS := -lpthread -lm -lssl -lcrypto - - TARGET := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown) -@@ -30,20 +30,8 @@ - CFLAGS += -I$(ODIR)/include - LDFLAGS += -L$(ODIR)/lib - --ifneq ($(WITH_LUAJIT),) -- CFLAGS += -I$(WITH_LUAJIT)/include -- LDFLAGS += -L$(WITH_LUAJIT)/lib --else -- CFLAGS += -I$(ODIR)/include/luajit-2.1 -- DEPS += $(ODIR)/lib/libluajit-5.1.a --endif -- --ifneq ($(WITH_OPENSSL),) -- CFLAGS += -I$(WITH_OPENSSL)/include -- LDFLAGS += -L$(WITH_OPENSSL)/lib --else -- DEPS += $(ODIR)/lib/libssl.a --endif -+CFLAGS += $(shell pkg-config openssl luajit --cflags) -+LDFLAGS += $(shell pkg-config openssl luajit --libs) - - all: $(BIN) - |