commit: fad10b987b46a7c062dc561430ca8f04a6ce0eba Author: Vikraman Choudhury <vikraman <AT> gentoo <DOT> org> AuthorDate: Fri Feb 16 03:19:02 2018 +0000 Commit: Vikraman Choudhury <vikraman <AT> gentoo <DOT> org> CommitDate: Fri Feb 16 06:59:04 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fad10b98
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 +++++++++++++++++++++++ app-benchmarks/wrk/wrk-4.1.0.ebuild | 8 +++++- 2 files changed, 38 insertions(+), 1 deletion(-) 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 00000000000..6f091accca5 --- /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) + diff --git a/app-benchmarks/wrk/wrk-4.1.0.ebuild b/app-benchmarks/wrk/wrk-4.1.0.ebuild index 8dc7bbdad50..397a84d2958 100644 --- a/app-benchmarks/wrk/wrk-4.1.0.ebuild +++ b/app-benchmarks/wrk/wrk-4.1.0.ebuild @@ -15,13 +15,19 @@ KEYWORDS="~x86 ~amd64" IUSE="libressl" DEPEND=">=dev-lang/luajit-2.0.2 + dev-lang/lua:0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )" RDEPEND="${DEPEND}" +src_prepare() { + rm -rf deps/ || die "failed to remove bundled dependencies" + epatch "${FILESDIR}/${PN}-4.1.0-makefile.patch" +} + src_compile() { tc-export CC - emake VER="${PV}" WITH_LUAJIT="${EPREFIX}"/usr WITH_OPENSSL="${EPREFIX}"/usr + emake } src_install() {
