diff options
Diffstat (limited to 'app-benchmarks/wrk/files')
| -rw-r--r-- | app-benchmarks/wrk/files/wrk-4.2.0-makefile.patch (renamed from app-benchmarks/wrk/files/wrk-4.1.0-r1-makefile.patch) | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/app-benchmarks/wrk/files/wrk-4.1.0-r1-makefile.patch b/app-benchmarks/wrk/files/wrk-4.2.0-makefile.patch index 6e7dd317b8fb..b5a32ae9b5eb 100644 --- a/app-benchmarks/wrk/files/wrk-4.1.0-r1-makefile.patch +++ b/app-benchmarks/wrk/files/wrk-4.2.0-makefile.patch @@ -1,21 +1,38 @@ ---- a/Makefile 2018-01-21 07:00:58.000000000 +0100 -+++ b/Makefile 2018-11-09 11:58:57.000000000 +0100 +--- a/Makefile ++++ b/Makefile @@ -1,4 +1,4 @@ -CFLAGS += -std=c99 -Wall -O2 -D_REENTRANT +CFLAGS += -std=c99 -Wall -D_REENTRANT - LIBS := -lpthread -lm -lssl -lcrypto + LIBS := -lm -lssl -lcrypto -lpthread TARGET := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown) -@@ -24,7 +24,7 @@ +@@ -24,15 +24,13 @@ ODIR := obj OBJ := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o $(ODIR)/version.o -LIBS := -lluajit-5.1 $(LIBS) -+LIBS := $(shell pkg-config luajit --libs) $(LIBS) ++LIBS := $(LUA_LIBS) $(LIBS) DEPS := CFLAGS += -I$(ODIR)/include -@@ -51,8 +51,7 @@ +-LDFLAGS += -L$(ODIR)/lib + + ifneq ($(WITH_LUAJIT),) +- CFLAGS += -I$(WITH_LUAJIT)/include +- LDFLAGS += -L$(WITH_LUAJIT)/lib ++ CFLAGS += $(WITH_LUAJIT) + else + CFLAGS += -I$(ODIR)/include/luajit-2.1 + DEPS += $(ODIR)/lib/libluajit-5.1.a +@@ -40,7 +38,6 @@ + + ifneq ($(WITH_OPENSSL),) + CFLAGS += -I$(WITH_OPENSSL)/include +- LDFLAGS += -L$(WITH_OPENSSL)/lib + else + DEPS += $(ODIR)/lib/libssl.a + endif +@@ -51,8 +48,7 @@ $(RM) -rf $(BIN) obj/* $(BIN): $(OBJ) @@ -25,7 +42,7 @@ $(OBJ): config.h Makefile $(DEPS) | $(ODIR) -@@ -67,8 +66,7 @@ +@@ -67,8 +63,7 @@ @echo 'const char *VERSION="$(VER)";' | $(CC) -xc -c -o $@ - $(ODIR)/%.o : %.c |