From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E78261382C5 for ; Wed, 27 Jan 2021 18:35:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5588E0C31; Wed, 27 Jan 2021 18:35:04 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BFE07E0C31 for ; Wed, 27 Jan 2021 18:35:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9C4DC335D82 for ; Wed, 27 Jan 2021 18:35:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D1D56476 for ; Wed, 27 Jan 2021 18:35:01 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1611772489.4eff9d94176b5fffa327a5a26d1a4f34d250255c.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/wrk/, app-benchmarks/wrk/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-benchmarks/wrk/files/wrk-4.1.0-r2-makefile.patch app-benchmarks/wrk/wrk-4.1.0-r2.ebuild X-VCS-Directories: app-benchmarks/wrk/ app-benchmarks/wrk/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 4eff9d94176b5fffa327a5a26d1a4f34d250255c X-VCS-Branch: master Date: Wed, 27 Jan 2021 18:35:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7fcd0d63-c3f3-43d9-9d20-49c7c0806634 X-Archives-Hash: 9cf307a8f1297e962c29ff2a6cd34ca0 commit: 4eff9d94176b5fffa327a5a26d1a4f34d250255c Author: Conrad Kostecki gentoo org> AuthorDate: Wed Jan 27 18:26:30 2021 +0000 Commit: Conrad Kostecki gentoo 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 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 -}