commit: 89bbdb3384c4aa63bb3a88bdec28fc9f2c66e936 Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com> AuthorDate: Sun Jul 21 19:20:13 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Jul 21 19:53:27 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89bbdb33
app-benchmarks/wrk: drop old version Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com> Closes: https://github.com/gentoo/gentoo/pull/12499 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> app-benchmarks/wrk/Manifest | 2 - app-benchmarks/wrk/files/wrk-3.1.1-makefile.patch | 54 ----------------------- app-benchmarks/wrk/files/wrk-4.1.0-makefile.patch | 31 ------------- app-benchmarks/wrk/wrk-3.1.2.ebuild | 37 ---------------- app-benchmarks/wrk/wrk-4.0.2.ebuild | 32 -------------- app-benchmarks/wrk/wrk-4.1.0.ebuild | 38 ---------------- 6 files changed, 194 deletions(-) diff --git a/app-benchmarks/wrk/Manifest b/app-benchmarks/wrk/Manifest index eb51b42ec75..71e1020fd8d 100644 --- a/app-benchmarks/wrk/Manifest +++ b/app-benchmarks/wrk/Manifest @@ -1,3 +1 @@ -DIST wrk-3.1.2.tar.gz 902868 BLAKE2B 1b979a7b72c41d37ec63759c76770a74ca8cf618bf2e84b30556fa7db47b3cbe4957924a5ad90594580d4fed5194201d6205b04c660195466c6d6fb369604571 SHA512 399f33c2c008c21ac8fae1b561fe16ebcca324b5171340ffa706e84c256bf13a9983b5c18d258be6f87cb9fe8e38a434f9bfa7059395a01cb783f77faf952b15 -DIST wrk-4.0.2.tar.gz 6146798 BLAKE2B 62188872a370d4ef3a3ffcf6f0568ca1b003473a1333b51d2b79fc3ce793c39ba5958d95c877fc0382751e89b687c8ee7f20b376c9b2fe3826afc3161aa0ac8e SHA512 4279cf7136e2919779be3f61f462136a7a5288eac481104b844193682a8fc554581fd3942624d0be9317a3e82c82497927a124b9b4dbdf455e30d3f0cad1fdea DIST wrk-4.1.0.tar.gz 6478125 BLAKE2B d64c172819a32b874e5351ef1088a66af7eb76ae34421577f817f14797a5711665adb8074e90a80e511139a889d4c960dc91caa5855bbd67038229307ef93ed2 SHA512 2c8d05f8e40c3a6234bc1c2862157764532a39046860210fe512c260c2b940e1e3120b831d0721c936c7bca474574600cda1f4c949b53738199d98102e32cb1a diff --git a/app-benchmarks/wrk/files/wrk-3.1.1-makefile.patch b/app-benchmarks/wrk/files/wrk-3.1.1-makefile.patch deleted file mode 100644 index 595c69ac157..00000000000 --- a/app-benchmarks/wrk/files/wrk-3.1.1-makefile.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git i/Makefile w/Makefile -index d956c6b..48be677 100644 ---- i/Makefile -+++ w/Makefile -@@ -1,4 +1,4 @@ --CFLAGS := -std=c99 -Wall -O2 -D_REENTRANT -+CFLAGS += -std=c99 -Wall -D_REENTRANT - LIBS := -lpthread -lm -lcrypto -lssl - - TARGET := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown) -@@ -23,38 +23,31 @@ BIN := wrk - ODIR := obj - OBJ := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o - --LDIR = deps/luajit/src --LIBS := -lluajit $(LIBS) --CFLAGS += -I$(LDIR) --LDFLAGS += -L$(LDIR) -+LIBS := $(shell pkg-config --libs luajit) $(LIBS) -+CFLAGS += $(shell pkg-config --cflags luajit) - - all: $(BIN) - - clean: - $(RM) $(BIN) obj/* -- @$(MAKE) -C deps/luajit clean - - $(BIN): $(OBJ) - @echo LINK $(BIN) -- @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -+ @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) - --$(OBJ): config.h Makefile $(LDIR)/libluajit.a | $(ODIR) -+$(OBJ): config.h Makefile | $(ODIR) - - $(ODIR): - @mkdir -p $@ - - $(ODIR)/bytecode.o: src/wrk.lua - @echo LUAJIT $< -- @$(SHELL) -c 'cd $(LDIR) && ./luajit -b $(CURDIR)/$< $(CURDIR)/$@' -+ @$(SHELL) -c 'luajit -b $(CURDIR)/$< $(CURDIR)/$@' - - $(ODIR)/%.o : %.c - @echo CC $< - @$(CC) $(CFLAGS) -c -o $@ $< - --$(LDIR)/libluajit.a: -- @echo Building LuaJIT... -- @$(MAKE) -C $(LDIR) BUILDMODE=static -- - .PHONY: all clean - .SUFFIXES: - .SUFFIXES: .c .o .lua diff --git a/app-benchmarks/wrk/files/wrk-4.1.0-makefile.patch b/app-benchmarks/wrk/files/wrk-4.1.0-makefile.patch deleted file mode 100644 index 6f091accca5..00000000000 --- a/app-benchmarks/wrk/files/wrk-4.1.0-makefile.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- 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-3.1.2.ebuild b/app-benchmarks/wrk/wrk-3.1.2.ebuild deleted file mode 100644 index 62466fde299..00000000000 --- a/app-benchmarks/wrk/wrk-3.1.2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -DESCRIPTION="A modern HTTP benchmarking tool" -HOMEPAGE="https://github.com/wg/wrk"; -SRC_URI="https://github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="libressl" - -DEPEND=">=dev-lang/luajit-2.0.2 - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= )" -RDEPEND="${DEPEND}" - -src_prepare() { - rm -rf deps/luajit || die "failed to remove bundled luajit" - epatch "${FILESDIR}/${PN}-3.1.1-makefile.patch" -} - -src_compile() { - tc-export CC - emake -} - -src_install() { - dobin ${PN} - dodoc README NOTICE - insinto /usr/share/${PN} - doins -r scripts -} diff --git a/app-benchmarks/wrk/wrk-4.0.2.ebuild b/app-benchmarks/wrk/wrk-4.0.2.ebuild deleted file mode 100644 index 0e6fa418a27..00000000000 --- a/app-benchmarks/wrk/wrk-4.0.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -DESCRIPTION="A modern HTTP benchmarking tool" -HOMEPAGE="https://github.com/wg/wrk"; -SRC_URI="https://github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libressl" - -DEPEND=">=dev-lang/luajit-2.0.2 - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= )" -RDEPEND="${DEPEND}" - -src_compile() { - tc-export CC - emake VER="${PV}" WITH_LUAJIT="${EPREFIX}"/usr WITH_OPENSSL="${EPREFIX}"/usr -} - -src_install() { - dobin ${PN} - dodoc README NOTICE - insinto /usr/share/${PN} - doins -r scripts -} diff --git a/app-benchmarks/wrk/wrk-4.1.0.ebuild b/app-benchmarks/wrk/wrk-4.1.0.ebuild deleted file mode 100644 index 0e8caf2dc30..00000000000 --- a/app-benchmarks/wrk/wrk-4.1.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -DESCRIPTION="A modern HTTP benchmarking tool" -HOMEPAGE="https://github.com/wg/wrk"; -SRC_URI="https://github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -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 -} - -src_install() { - dobin ${PN} - dodoc README.md NOTICE - insinto /usr/share/${PN} - doins -r scripts -}
