diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2016-04-12 10:43:37 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2016-04-12 10:43:37 +0000 |
| commit | 2389686eb5fac626e46996ea2084e6f4368bc4c2 (patch) | |
| tree | 3a6575a23e575266ad5d4e1e31a83dbe85748297 /benchmarks | |
| parent | Update to 3.4.11. (diff) | |
Upgrade from 4.0.1 to 4.0.2.
Notes
Notes:
svn path=/head/; revision=413109
Diffstat (limited to 'benchmarks')
| -rw-r--r-- | benchmarks/wrk/Makefile | 5 | ||||
| -rw-r--r-- | benchmarks/wrk/distinfo | 4 | ||||
| -rw-r--r-- | benchmarks/wrk/files/patch-Makefile | 49 |
3 files changed, 5 insertions, 53 deletions
diff --git a/benchmarks/wrk/Makefile b/benchmarks/wrk/Makefile index 7331039a3249..9ba0f1a97b8f 100644 --- a/benchmarks/wrk/Makefile +++ b/benchmarks/wrk/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= wrk -PORTVERSION= 4.0.1 -PORTREVISION= 3 +PORTVERSION= 4.0.2 CATEGORIES= benchmarks www MAINTAINER= osa@FreeBSD.org @@ -18,7 +17,9 @@ GH_ACCOUNT= wg USES= gmake USE_OPENSSL= yes +WITH_OPENSSL_PORT= yes CFLAGS+= -std=c99 -D_DECLARE_C99_LDBL_MATH +MAKE_ENV+= WITH_OPENSSL=${LOCALBASE} WITH_LUAJIT=${LOCALBASE} VER=${PORTVERSION} PLIST_FILES= bin/wrk diff --git a/benchmarks/wrk/distinfo b/benchmarks/wrk/distinfo index a14b22cb0f61..9729ffe00688 100644 --- a/benchmarks/wrk/distinfo +++ b/benchmarks/wrk/distinfo @@ -1,2 +1,2 @@ -SHA256 (wg-wrk-4.0.1_GH0.tar.gz) = c03bbc283836cb4b706eb6bfd18e724a8ce475e2c16154c13c6323a845b4327d -SIZE (wg-wrk-4.0.1_GH0.tar.gz) = 903500 +SHA256 (wg-wrk-4.0.2_GH0.tar.gz) = a4a6ad6727733023771163e7250189a9a23e6253b5e5025191baa6092d5a26fb +SIZE (wg-wrk-4.0.2_GH0.tar.gz) = 6146798 diff --git a/benchmarks/wrk/files/patch-Makefile b/benchmarks/wrk/files/patch-Makefile deleted file mode 100644 index 60d14b8af194..000000000000 --- a/benchmarks/wrk/files/patch-Makefile +++ /dev/null @@ -1,49 +0,0 @@ ---- Makefile.orig 2015-03-24 13:03:52.000000000 +0300 -+++ Makefile 2015-06-02 22:37:10.831330000 +0300 -@@ -1,5 +1,5 @@ --CFLAGS := -std=c99 -Wall -O2 -D_REENTRANT --LIBS := -lpthread -lm -lcrypto -lssl -+CFLAGS += -std=c99 -Wall -O2 -D_REENTRANT -+LIBS := -pthread -lm -lcrypto -lssl - - TARGET := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown) - -@@ -25,32 +25,32 @@ - OBJ := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o - - LDIR = deps/luajit/src --LIBS := -lluajit $(LIBS) - CFLAGS += -I$(LDIR) - LDFLAGS += -L$(LDIR) -+PREFIX := ${PREFIX} -+LIBS := -lluajit-5.1 $(LIBS) -L$(PREFIX)/lib - - all: $(BIN) - - clean: - $(RM) $(BIN) obj/* -- @$(MAKE) -C deps/luajit clean - - $(BIN): $(OBJ) - @echo LINK $(BIN) -- @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -+ $(CC) $(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 '${PREFIX}/bin/luajit -b $(CURDIR)/$< $(CURDIR)/$@' - - $(ODIR)/%.o : %.c - @echo CC $< -- @$(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) -c -o $@ $< - - $(LDIR)/libluajit.a: - @echo Building LuaJIT... |