diff options
| author |   Conrad Kostecki <conrad@kostecki.com> | 2019-07-21 21:20:13 +0200 |
|---|---|---|
| committer |   Michał Górny <mgorny@gentoo.org> | 2019-07-21 21:53:27 +0200 |
| commit | 89bbdb3384c4aa63bb3a88bdec28fc9f2c66e936 (patch) | |
| tree | 5642ee6057067fc036e5accea94675b4c3909f68 /app-benchmarks/wrk/files | |
| parent | app-benchmarks/stress-ng: drop old version (diff) | |
| download | gentoo-89bbdb3384c4aa63bb3a88bdec28fc9f2c66e936.tar.gz gentoo-89bbdb3384c4aa63bb3a88bdec28fc9f2c66e936.tar.bz2 gentoo-89bbdb3384c4aa63bb3a88bdec28fc9f2c66e936.zip | |
app-benchmarks/wrk: drop old version
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/12499
Signed-off-by: Michał Górny <mgorny@gentoo.org>
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) - |