commit: 4eff9d94176b5fffa327a5a26d1a4f34d250255c Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Wed Jan 27 18:26:30 2021 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Wed Jan 27 18:34:49 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eff9d94
app-benchmarks/wrk: drop old version Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../wrk/files/wrk-4.1.0-r2-makefile.patch | 63 ---------------------- app-benchmarks/wrk/wrk-4.1.0-r2.ebuild | 57 -------------------- 2 files changed, 120 deletions(-) diff --git a/app-benchmarks/wrk/files/wrk-4.1.0-r2-makefile.patch b/app-benchmarks/wrk/files/wrk-4.1.0-r2-makefile.patch deleted file mode 100644 index 85de3eaf3c3..00000000000 --- a/app-benchmarks/wrk/files/wrk-4.1.0-r2-makefile.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- 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 := $(shell pkg-config luajit --libs) $(LIBS) - - DEPS := - 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 -@@ -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 - diff --git a/app-benchmarks/wrk/wrk-4.1.0-r2.ebuild b/app-benchmarks/wrk/wrk-4.1.0-r2.ebuild deleted file mode 100644 index 34bc8be4849..00000000000 --- a/app-benchmarks/wrk/wrk-4.1.0-r2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="A HTTP benchmarking tool" -HOMEPAGE="https://www.github.com/wg/wrk"; -SRC_URI="https://www.github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -KEYWORDS="amd64 x86" -LICENSE="Apache-2.0 BSD MIT" -SLOT="0" -IUSE="libressl" - -CBUILD="dev-lang/luajit:2" - -DEPEND=" - dev-lang/lua:0 - libressl? ( dev-libs/libressl:0= ) - !libressl? ( dev-libs/openssl:0= ) -" - -RDEPEND=" - ${CBUILD} - ${RDEPEND} -" - -BDEPEND=" - ${CBUILD} - virtual/pkgconfig -" - -DOCS=( "CHANGES" "NOTICE" "README.md" "SCRIPTING" ) - -PATCHES=( "${FILESDIR}/${P}-r2-makefile.patch" ) - -src_compile() { - myemakeargs=( - CC="$(tc-getCC)" - VER="${PV}" - WITH_LUAJIT="/usr" - WITH_OPENSSL="/usr" - ) - - emake "${myemakeargs[@]}" -} - -src_install() { - dobin wrk - - insinto /usr/share/wrk - doins -r scripts - - einstalldocs -}
