* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/wrk/, app-benchmarks/wrk/files/
@ 2019-01-20 22:56 Patrice Clement
0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2019-01-20 22:56 UTC (permalink / raw
To: gentoo-commits
commit: 3699f64fa928e498f86e3d6761ff2d20712042cd
Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Fri Nov 9 11:12:00 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Jan 20 22:56:30 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3699f64f
app-benchmarks/wrk: bump to EAPI 7.
I will also proxy maintain this package.
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/10374
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
.../wrk/files/wrk-4.1.0-r1-makefile.patch | 37 +++++++++++++++
app-benchmarks/wrk/metadata.xml | 23 ++++++---
app-benchmarks/wrk/wrk-4.1.0-r1.ebuild | 54 ++++++++++++++++++++++
3 files changed, 107 insertions(+), 7 deletions(-)
diff --git a/app-benchmarks/wrk/files/wrk-4.1.0-r1-makefile.patch b/app-benchmarks/wrk/files/wrk-4.1.0-r1-makefile.patch
new file mode 100644
index 00000000000..6e7dd317b8f
--- /dev/null
+++ b/app-benchmarks/wrk/files/wrk-4.1.0-r1-makefile.patch
@@ -0,0 +1,37 @@
+--- a/Makefile 2018-01-21 07:00:58.000000000 +0100
++++ b/Makefile 2018-11-09 11:58:57.000000000 +0100
+@@ -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)
+@@ -24,7 +24,7 @@
+
+ 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
+@@ -51,8 +51,7 @@
+ $(RM) -rf $(BIN) obj/*
+
+ $(BIN): $(OBJ)
+- @echo LINK $(BIN)
+- @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+ $(OBJ): config.h Makefile $(DEPS) | $(ODIR)
+
+@@ -67,8 +66,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/metadata.xml b/app-benchmarks/wrk/metadata.xml
index d7936a9dcc5..60f2e98d3c9 100644
--- a/app-benchmarks/wrk/metadata.xml
+++ b/app-benchmarks/wrk/metadata.xml
@@ -1,15 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!--maintainer-needed-->
- <longdescription lang="en">
- wrk is a modern HTTP benchmarking tool capable of generating
- significant load when run on a single multi-core CPU. It combines a
- multithreaded design with scalable event notification systems such as
- epoll and kqueue. An optional LuaJIT script can perform HTTP request
- generation, response processing, and custom reporting.
+ <maintainer type="person">
+ <email>ck+gentoo@bl4ckb0x.de</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ WRK is a modern HTTP benchmarking tool capable of generating
+ significant load when run on a single multi-core CPU.
+ It combines a multithreaded design with scalable event
+ notification systems such as epoll and kqueue.
+ An optional LuaJIT script can perform HTTP request generation,
+ response processing, and custom reporting.
</longdescription>
<upstream>
+ <bugs-to>https://www.github.com/wg/wrk/issues</bugs-to>
<remote-id type="github">wg/wrk</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-benchmarks/wrk/wrk-4.1.0-r1.ebuild b/app-benchmarks/wrk/wrk-4.1.0-r1.ebuild
new file mode 100644
index 00000000000..3a9e5c1ade6
--- /dev/null
+++ b/app-benchmarks/wrk/wrk-4.1.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 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"
+
+RDEPEND="
+ dev-lang/lua:0
+ dev-lang/luajit:2
+ libressl? ( dev-libs/libressl:0= )
+ !libressl? ( dev-libs/openssl:0= )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=(
+ "CHANGES"
+ "NOTICE"
+ "README.md"
+ "SCRIPTING"
+)
+
+PATCHES=( "${FILESDIR}/${P}-r1-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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/wrk/, app-benchmarks/wrk/files/
@ 2021-01-27 18:35 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2021-01-27 18:35 UTC (permalink / raw
To: gentoo-commits
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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/wrk/, app-benchmarks/wrk/files/
@ 2022-01-20 22:58 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2022-01-20 22:58 UTC (permalink / raw
To: gentoo-commits
commit: ef938fd4ecd6119be9de756cd040c6fec2f1100d
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 20 22:40:04 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Jan 20 22:57:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef938fd4
app-benchmarks/wrk: drop 4.1.0-r100
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
app-benchmarks/wrk/Manifest | 1 -
.../wrk/files/wrk-4.1.0-r100-makefile.patch | 64 ----------------------
app-benchmarks/wrk/wrk-4.1.0-r100.ebuild | 49 -----------------
3 files changed, 114 deletions(-)
diff --git a/app-benchmarks/wrk/Manifest b/app-benchmarks/wrk/Manifest
index d07beee0476a..3ca7d14266d1 100644
--- a/app-benchmarks/wrk/Manifest
+++ b/app-benchmarks/wrk/Manifest
@@ -1,2 +1 @@
-DIST wrk-4.1.0.tar.gz 6478125 BLAKE2B d64c172819a32b874e5351ef1088a66af7eb76ae34421577f817f14797a5711665adb8074e90a80e511139a889d4c960dc91caa5855bbd67038229307ef93ed2 SHA512 2c8d05f8e40c3a6234bc1c2862157764532a39046860210fe512c260c2b940e1e3120b831d0721c936c7bca474574600cda1f4c949b53738199d98102e32cb1a
DIST wrk-4.2.0.tar.gz 10973405 BLAKE2B e81698f70017cd7d55ee7adceb050ea48b2ed9d2ef9195e5b2743dafb637f78d54c8003d049c2965f90457f9b7a80620b86bc0b9bb1a259b88e5c66d6af8cc79 SHA512 c356b1314f37b558f39f30d9a9c6a2a9c2f646eaf7c0cb4262325850922528148f89ccbe7c33390c87e40f8fef6fffd704e3cfe75a89e4e9b178101043fa038d
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
deleted file mode 100644
index d3c838d08003..000000000000
--- a/app-benchmarks/wrk/files/wrk-4.1.0-r100-makefile.patch
+++ /dev/null
@@ -1,64 +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 := $(LUA_LIBS) $(LIBS)
-
- DEPS :=
- CFLAGS += -I$(ODIR)/include
--LDFLAGS += -L$(ODIR)/lib
-
- ifneq ($(WITH_LUAJIT),)
-- CFLAGS += -I$(WITH_LUAJIT)/include
-- LDFLAGS += -L$(WITH_LUAJIT)/lib
-+ CFLAGS += $(WITH_LUAJIT)
- 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-r100.ebuild b/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild
deleted file mode 100644
index ae473486ff83..000000000000
--- a/app-benchmarks/wrk/wrk-4.1.0-r100.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-
-inherit lua-single 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"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
- dev-libs/openssl:0=
- ${LUA_DEPS}
-"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( "CHANGES" "NOTICE" "README.md" "SCRIPTING" )
-
-PATCHES=( "${FILESDIR}/${P}-r100-makefile.patch" )
-
-src_compile() {
- myemakeargs=(
- CC="$(tc-getCC)"
- LUA_LIBS="$(lua_get_LIBS)"
- VER="${PV}"
- WITH_LUAJIT="$(lua_get_CFLAGS)"
- WITH_OPENSSL="/usr"
- )
-
- emake "${myemakeargs[@]}"
-}
-
-src_install() {
- dobin wrk
-
- insinto /usr/share/wrk
- doins -r scripts
-
- einstalldocs
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-01-20 22:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-27 18:35 [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/wrk/, app-benchmarks/wrk/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2022-01-20 22:58 Conrad Kostecki
2019-01-20 22:56 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox