From fad10b987b46a7c062dc561430ca8f04a6ce0eba Mon Sep 17 00:00:00 2001 From: Vikraman Choudhury Date: Thu, 15 Feb 2018 22:19:02 -0500 Subject: app-benchmarks/wrk: Fix lua dep and patch Makefile X-Gentoo-Bug: 646692 X-Gentoo-Bug-Url: https://bugs.gentoo.org/646692 Package-Manager: Portage-2.3.13, Repoman-2.3.3 --- app-benchmarks/wrk/files/wrk-4.1.0-makefile.patch | 31 +++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 app-benchmarks/wrk/files/wrk-4.1.0-makefile.patch (limited to 'app-benchmarks/wrk/files') 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) + -- cgit v1.2.3-65-gdbad