diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /app-benchmarks/wrk/files | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (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, 85 insertions, 0 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 new file mode 100644 index 000000000000..595c69ac1572 --- /dev/null +++ b/app-benchmarks/wrk/files/wrk-3.1.1-makefile.patch @@ -0,0 +1,54 @@ +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 new file mode 100644 index 000000000000..6f091accca56 --- /dev/null +++ b/app-benchmarks/wrk/files/wrk-4.1.0-makefile.patch @@ -0,0 +1,31 @@ +--- 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) + |