diff options
| author |   Conrad Kostecki <conikost@gentoo.org> | 2020-11-19 00:03:02 +0100 |
|---|---|---|
| committer | Conrad Kostecki <conikost@gentoo.org> | 2020-11-19 00:03:51 +0100 |
| commit | 0ab9661a7a83315fa95c0eedd7c4a225cfdab13c (patch) | |
| tree | 3537ac16f3361b792f290036cd3e258922045b1b /app-benchmarks/wrk/files | |
| parent | dev-util/jenkins-bin: bump to v2.267 (diff) | |
| download | gentoo-0ab9661a7a83315fa95c0eedd7c4a225cfdab13c.tar.gz gentoo-0ab9661a7a83315fa95c0eedd7c4a225cfdab13c.tar.bz2 gentoo-0ab9661a7a83315fa95c0eedd7c4a225cfdab13c.zip | |
app-benchmarks/wrk: migrate to slotted lua-single
Closes: https://bugs.gentoo.org/752525
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'app-benchmarks/wrk/files')
| -rw-r--r-- | app-benchmarks/wrk/files/wrk-4.1.0-r100-makefile.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/app-benchmarks/wrk/files/wrk-4.1.0-r100-makefile.patch b/app-benchmarks/wrk/files/wrk-4.1.0-r100-makefile.patch new file mode 100644 index 000000000000..d3c838d08003 --- /dev/null +++ b/app-benchmarks/wrk/files/wrk-4.1.0-r100-makefile.patch @@ -0,0 +1,64 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ +-CFLAGS += -std=c99 -Wall -O2 -D_REENTRANT +-LIBS := -lpthread -lm -lssl -lcrypto ++CFLAGS += -std=c99 -Wall -D_REENTRANT ++LIBS := -lm -lssl -lcrypto -lpthread + + TARGET := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown) + +@@ -24,15 +24,13 @@ + + ODIR := obj + OBJ := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o $(ODIR)/version.o +-LIBS := -lluajit-5.1 $(LIBS) ++LIBS := $(LUA_LIBS) $(LIBS) + + DEPS := + CFLAGS += -I$(ODIR)/include +-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,15 +48,14 @@ + $(RM) -rf $(BIN) obj/* + + $(BIN): $(OBJ) +- @echo LINK $(BIN) +- @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) ++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) + + $(OBJ): config.h Makefile $(DEPS) | $(ODIR) + + $(ODIR): + @mkdir -p $@ + +-$(ODIR)/bytecode.o: src/wrk.lua ++$(ODIR)/bytecode.c: src/wrk.lua + @echo LUAJIT $< + @$(SHELL) -c 'PATH=obj/bin:$(PATH) luajit -b $(CURDIR)/$< $(CURDIR)/$@' + +@@ -67,8 +63,7 @@ + @echo 'const char *VERSION="$(VER)";' | $(CC) -xc -c -o $@ - + + $(ODIR)/%.o : %.c +- @echo CC $< +- @$(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) -c -o $@ $< + + # Dependencies + |