diff options
author | Dan Goodliffe <dan@randomdan.homeip.net> | 2018-02-12 19:33:49 +0000 |
---|---|---|
committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2018-02-12 19:33:49 +0000 |
commit | 3b2c4d6a6d1c85ad9d71c55701b8d8efce4a067e (patch) | |
tree | 69adc4edfa9080496fc30f751ef08ff2d9ffd468 | |
parent | libcdio patch no longer required (diff) | |
download | patches-3b2c4d6a6d1c85ad9d71c55701b8d8efce4a067e.tar.bz2 patches-3b2c4d6a6d1c85ad9d71c55701b8d8efce4a067e.tar.xz patches-3b2c4d6a6d1c85ad9d71c55701b8d8efce4a067e.zip |
Add patch to use pkg-config and instead of assuming paths, bug 646692
-rw-r--r-- | app-benchmarks/wrk/pkg-config.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/app-benchmarks/wrk/pkg-config.patch b/app-benchmarks/wrk/pkg-config.patch new file mode 100644 index 0000000..d204a9e --- /dev/null +++ b/app-benchmarks/wrk/pkg-config.patch @@ -0,0 +1,25 @@ +--- wrk-4.1.0/Makefile 2018-01-21 06:00:58.000000000 +0000 ++++ wrk-4.1.0/Makefile 2018-02-12 19:13:16.127644902 +0000 +@@ -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) + |