| 1 |
commit: ef938fd4ecd6119be9de756cd040c6fec2f1100d |
| 2 |
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 20 22:40:04 2022 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 20 22:57:48 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef938fd4 |
| 7 |
|
| 8 |
app-benchmarks/wrk: drop 4.1.0-r100 |
| 9 |
|
| 10 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 11 |
|
| 12 |
app-benchmarks/wrk/Manifest | 1 - |
| 13 |
.../wrk/files/wrk-4.1.0-r100-makefile.patch | 64 ---------------------- |
| 14 |
app-benchmarks/wrk/wrk-4.1.0-r100.ebuild | 49 ----------------- |
| 15 |
3 files changed, 114 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-benchmarks/wrk/Manifest b/app-benchmarks/wrk/Manifest |
| 18 |
index d07beee0476a..3ca7d14266d1 100644 |
| 19 |
--- a/app-benchmarks/wrk/Manifest |
| 20 |
+++ b/app-benchmarks/wrk/Manifest |
| 21 |
@@ -1,2 +1 @@ |
| 22 |
-DIST wrk-4.1.0.tar.gz 6478125 BLAKE2B d64c172819a32b874e5351ef1088a66af7eb76ae34421577f817f14797a5711665adb8074e90a80e511139a889d4c960dc91caa5855bbd67038229307ef93ed2 SHA512 2c8d05f8e40c3a6234bc1c2862157764532a39046860210fe512c260c2b940e1e3120b831d0721c936c7bca474574600cda1f4c949b53738199d98102e32cb1a |
| 23 |
DIST wrk-4.2.0.tar.gz 10973405 BLAKE2B e81698f70017cd7d55ee7adceb050ea48b2ed9d2ef9195e5b2743dafb637f78d54c8003d049c2965f90457f9b7a80620b86bc0b9bb1a259b88e5c66d6af8cc79 SHA512 c356b1314f37b558f39f30d9a9c6a2a9c2f646eaf7c0cb4262325850922528148f89ccbe7c33390c87e40f8fef6fffd704e3cfe75a89e4e9b178101043fa038d |
| 24 |
|
| 25 |
diff --git a/app-benchmarks/wrk/files/wrk-4.1.0-r100-makefile.patch b/app-benchmarks/wrk/files/wrk-4.1.0-r100-makefile.patch |
| 26 |
deleted file mode 100644 |
| 27 |
index d3c838d08003..000000000000 |
| 28 |
--- a/app-benchmarks/wrk/files/wrk-4.1.0-r100-makefile.patch |
| 29 |
+++ /dev/null |
| 30 |
@@ -1,64 +0,0 @@ |
| 31 |
---- a/Makefile |
| 32 |
-+++ b/Makefile |
| 33 |
-@@ -1,5 +1,5 @@ |
| 34 |
--CFLAGS += -std=c99 -Wall -O2 -D_REENTRANT |
| 35 |
--LIBS := -lpthread -lm -lssl -lcrypto |
| 36 |
-+CFLAGS += -std=c99 -Wall -D_REENTRANT |
| 37 |
-+LIBS := -lm -lssl -lcrypto -lpthread |
| 38 |
- |
| 39 |
- TARGET := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown) |
| 40 |
- |
| 41 |
-@@ -24,15 +24,13 @@ |
| 42 |
- |
| 43 |
- ODIR := obj |
| 44 |
- OBJ := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o $(ODIR)/version.o |
| 45 |
--LIBS := -lluajit-5.1 $(LIBS) |
| 46 |
-+LIBS := $(LUA_LIBS) $(LIBS) |
| 47 |
- |
| 48 |
- DEPS := |
| 49 |
- CFLAGS += -I$(ODIR)/include |
| 50 |
--LDFLAGS += -L$(ODIR)/lib |
| 51 |
- |
| 52 |
- ifneq ($(WITH_LUAJIT),) |
| 53 |
-- CFLAGS += -I$(WITH_LUAJIT)/include |
| 54 |
-- LDFLAGS += -L$(WITH_LUAJIT)/lib |
| 55 |
-+ CFLAGS += $(WITH_LUAJIT) |
| 56 |
- else |
| 57 |
- CFLAGS += -I$(ODIR)/include/luajit-2.1 |
| 58 |
- DEPS += $(ODIR)/lib/libluajit-5.1.a |
| 59 |
-@@ -40,7 +38,6 @@ |
| 60 |
- |
| 61 |
- ifneq ($(WITH_OPENSSL),) |
| 62 |
- CFLAGS += -I$(WITH_OPENSSL)/include |
| 63 |
-- LDFLAGS += -L$(WITH_OPENSSL)/lib |
| 64 |
- else |
| 65 |
- DEPS += $(ODIR)/lib/libssl.a |
| 66 |
- endif |
| 67 |
-@@ -51,15 +48,14 @@ |
| 68 |
- $(RM) -rf $(BIN) obj/* |
| 69 |
- |
| 70 |
- $(BIN): $(OBJ) |
| 71 |
-- @echo LINK $(BIN) |
| 72 |
-- @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) |
| 73 |
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) |
| 74 |
- |
| 75 |
- $(OBJ): config.h Makefile $(DEPS) | $(ODIR) |
| 76 |
- |
| 77 |
- $(ODIR): |
| 78 |
- @mkdir -p $@ |
| 79 |
- |
| 80 |
--$(ODIR)/bytecode.o: src/wrk.lua |
| 81 |
-+$(ODIR)/bytecode.c: src/wrk.lua |
| 82 |
- @echo LUAJIT $< |
| 83 |
- @$(SHELL) -c 'PATH=obj/bin:$(PATH) luajit -b $(CURDIR)/$< $(CURDIR)/$@' |
| 84 |
- |
| 85 |
-@@ -67,8 +63,7 @@ |
| 86 |
- @echo 'const char *VERSION="$(VER)";' | $(CC) -xc -c -o $@ - |
| 87 |
- |
| 88 |
- $(ODIR)/%.o : %.c |
| 89 |
-- @echo CC $< |
| 90 |
-- @$(CC) $(CFLAGS) -c -o $@ $< |
| 91 |
-+ $(CC) $(CFLAGS) -c -o $@ $< |
| 92 |
- |
| 93 |
- # Dependencies |
| 94 |
- |
| 95 |
|
| 96 |
diff --git a/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild b/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild |
| 97 |
deleted file mode 100644 |
| 98 |
index ae473486ff83..000000000000 |
| 99 |
--- a/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild |
| 100 |
+++ /dev/null |
| 101 |
@@ -1,49 +0,0 @@ |
| 102 |
-# Copyright 1999-2021 Gentoo Authors |
| 103 |
-# Distributed under the terms of the GNU General Public License v2 |
| 104 |
- |
| 105 |
-EAPI=7 |
| 106 |
- |
| 107 |
-LUA_COMPAT=( luajit ) |
| 108 |
- |
| 109 |
-inherit lua-single toolchain-funcs |
| 110 |
- |
| 111 |
-DESCRIPTION="A HTTP benchmarking tool" |
| 112 |
-HOMEPAGE="https://www.github.com/wg/wrk" |
| 113 |
-SRC_URI="https://www.github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 114 |
- |
| 115 |
-KEYWORDS="amd64 x86" |
| 116 |
-LICENSE="Apache-2.0 BSD MIT" |
| 117 |
-SLOT="0" |
| 118 |
-REQUIRED_USE="${LUA_REQUIRED_USE}" |
| 119 |
- |
| 120 |
-RDEPEND=" |
| 121 |
- dev-libs/openssl:0= |
| 122 |
- ${LUA_DEPS} |
| 123 |
-" |
| 124 |
- |
| 125 |
-DEPEND="${RDEPEND}" |
| 126 |
- |
| 127 |
-DOCS=( "CHANGES" "NOTICE" "README.md" "SCRIPTING" ) |
| 128 |
- |
| 129 |
-PATCHES=( "${FILESDIR}/${P}-r100-makefile.patch" ) |
| 130 |
- |
| 131 |
-src_compile() { |
| 132 |
- myemakeargs=( |
| 133 |
- CC="$(tc-getCC)" |
| 134 |
- LUA_LIBS="$(lua_get_LIBS)" |
| 135 |
- VER="${PV}" |
| 136 |
- WITH_LUAJIT="$(lua_get_CFLAGS)" |
| 137 |
- WITH_OPENSSL="/usr" |
| 138 |
- ) |
| 139 |
- |
| 140 |
- emake "${myemakeargs[@]}" |
| 141 |
-} |
| 142 |
- |
| 143 |
-src_install() { |
| 144 |
- dobin wrk |
| 145 |
- |
| 146 |
- insinto /usr/share/wrk |
| 147 |
- doins -r scripts |
| 148 |
- |
| 149 |
- einstalldocs |
| 150 |
-} |
Archives