From fe9c49ae32ad2d3ad1006b07e6a4cd727da52197 Mon Sep 17 00:00:00 2001 From: ifurther <55025025+ifurther@users.noreply.github.com> Date: Thu, 7 May 2020 23:23:01 +0000 Subject: [PATCH] new package: wrk (#5262) * add wrk package * install luajit into docker image --- packages/wrk/Makefile.patch | 30 ++++++++++++++++++++++++++++++ packages/wrk/build.sh | 29 +++++++++++++++++++++++++++++ scripts/setup-ubuntu.sh | 3 +++ 3 files changed, 62 insertions(+) create mode 100644 packages/wrk/Makefile.patch create mode 100644 packages/wrk/build.sh diff --git a/packages/wrk/Makefile.patch b/packages/wrk/Makefile.patch new file mode 100644 index 000000000..acbfa44f5 --- /dev/null +++ b/packages/wrk/Makefile.patch @@ -0,0 +1,30 @@ +diff -uNr wrk-4.1.0/Makefile wrk-4.1.0.mod/Makefile +--- wrk-4.1.0/Makefile 2018-01-21 08:00:58.000000000 +0200 ++++ wrk-4.1.0.mod/Makefile 2020-05-08 02:09:33.254774677 +0300 +@@ -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 + + TARGET := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown) + +@@ -31,7 +31,7 @@ + LDFLAGS += -L$(ODIR)/lib + + ifneq ($(WITH_LUAJIT),) +- CFLAGS += -I$(WITH_LUAJIT)/include ++ CFLAGS += -I$(WITH_LUAJIT)/include/luajit-2.1 + LDFLAGS += -L$(WITH_LUAJIT)/lib + else + CFLAGS += -I$(ODIR)/include/luajit-2.1 +@@ -61,7 +61,7 @@ + + $(ODIR)/bytecode.o: src/wrk.lua + @echo LUAJIT $< +- @$(SHELL) -c 'PATH=obj/bin:$(PATH) luajit -b $(CURDIR)/$< $(CURDIR)/$@' ++ @$(SHELL) -c 'PATH=obj/bin:$(PATH) luajit -b -a $(_ARCH) $(CURDIR)/$< $(CURDIR)/$@' + + $(ODIR)/version.o: + @echo 'const char *VERSION="$(VER)";' | $(CC) -xc -c -o $@ - + diff --git a/packages/wrk/build.sh b/packages/wrk/build.sh new file mode 100644 index 000000000..cbae9812b --- /dev/null +++ b/packages/wrk/build.sh @@ -0,0 +1,29 @@ +TERMUX_PKG_HOMEPAGE=https://github.com/wg/wrk +TERMUX_PKG_DESCRIPTION="Modern HTTP benchmarking tool" +TERMUX_PKG_LICENSE="Apache-2.0" +TERMUX_PKG_VERSION=4.1.0 +TERMUX_PKG_SRCURL=https://github.com/wg/wrk/archive/${TERMUX_PKG_VERSION}.tar.gz +TERMUX_PKG_SHA256=6fa1020494de8c337913fd139d7aa1acb9a020de6f7eb9190753aa4b1e74271e +TERMUX_PKG_DEPENDS="openssl, luajit" +TERMUX_PKG_BUILD_IN_SRC=true + +termux_step_make() { + local _ARCH + + if [ "$TERMUX_ARCH" = "i686" ]; then + _ARCH="x86" + elif [ "$TERMUX_ARCH" = "x86_64" ]; then + _ARCH="x64" + elif [ "$TERMUX_ARCH" = "aarch64" ]; then + _ARCH="arm64" + else + _ARCH=$TERMUX_ARCH + fi + + make WITH_OPENSSL=$TERMUX_PREFIX WITH_LUAJIT=$TERMUX_PREFIX _ARCH=$_ARCH +} + +termux_step_make_install() { + install -Dm700 -t "$TERMUX_PREFIX"/bin wrk + install -Dm600 -t "$TERMUX_PREFIX"/share/doc/wrk/examples scripts/*.lua +} diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh index 8bf3f40f7..cbd4402b9 100755 --- a/scripts/setup-ubuntu.sh +++ b/scripts/setup-ubuntu.sh @@ -114,6 +114,9 @@ PACKAGES+=" clang-9" PACKAGES+=" libtinfo5" PACKAGES+=" lld" +# Needed by wrk. +PACKAGES+=" luajit" + # Needed by gitea. PACKAGES+=" npm"