diff options
| author | osa <osa@FreeBSD.org> | 2013-11-26 11:48:13 +0800 |
|---|---|---|
| committer | osa <osa@FreeBSD.org> | 2013-11-26 11:48:13 +0800 |
| commit | 611abacf73e51fe80c52d7aa17402ed5fb082396 (patch) | |
| tree | ab20ddd1375c3528087869235c2205e4d46253e5 /benchmarks | |
| parent | bc4b3993e8b48bcc59facb9ed09cdaf87c19a210 (diff) | |
| download | freebsd-ports-gnome-611abacf73e51fe80c52d7aa17402ed5fb082396.tar.gz freebsd-ports-gnome-611abacf73e51fe80c52d7aa17402ed5fb082396.tar.zst freebsd-ports-gnome-611abacf73e51fe80c52d7aa17402ed5fb082396.zip | |
Upgrade from 2.2.2 to 3.0.4.
Stagefy.
Diffstat (limited to 'benchmarks')
| -rw-r--r-- | benchmarks/wrk/Makefile | 7 | ||||
| -rw-r--r-- | benchmarks/wrk/distinfo | 4 | ||||
| -rw-r--r-- | benchmarks/wrk/files/patch-Makefile | 41 |
3 files changed, 47 insertions, 5 deletions
diff --git a/benchmarks/wrk/Makefile b/benchmarks/wrk/Makefile index 7d101ac58516..b63b2774157c 100644 --- a/benchmarks/wrk/Makefile +++ b/benchmarks/wrk/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wrk -PORTVERSION= 2.2.2 +PORTVERSION= 3.0.4 CATEGORIES= benchmarks www MASTER_SITES= https://github.com/wg/wrk/archive/ DISTNAME= ${PORTVERSION} @@ -14,6 +14,7 @@ COMMENT= The modern HTTP benchmarking tool LICENSE= AL2 FETCH_ARGS= -pRr +LIB_DEPENDS+= libluajit-5.1.so:${PORTSDIR}/lang/luajit WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USES= gmake CFLAGS+= -std=c99 -D_DECLARE_C99_LDBL_MATH @@ -28,9 +29,9 @@ BROKEN= does not link on FreeBSD 7.x .endif post-patch: - @${REINPLACE_CMD} '1d;2s/-lpthread/${PTHREAD_LIBS}/' ${WRKSRC}/Makefile + @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g;' ${WRKSRC}/Makefile do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.post.mk> diff --git a/benchmarks/wrk/distinfo b/benchmarks/wrk/distinfo index 4e3874034d35..d10c696d8323 100644 --- a/benchmarks/wrk/distinfo +++ b/benchmarks/wrk/distinfo @@ -1,2 +1,2 @@ -SHA256 (wrk/2.2.2.tar.gz) = c33e0d6dbb49819f41b46a65974203988401ee893d8bf64ad9836484a0d3b897 -SIZE (wrk/2.2.2.tar.gz) = 44112 +SHA256 (wrk/3.0.4.tar.gz) = 9d0b58b6123dd61bf1b00c180e39e80ea92cc90e14c758e899e0e7772c647661 +SIZE (wrk/3.0.4.tar.gz) = 897909 diff --git a/benchmarks/wrk/files/patch-Makefile b/benchmarks/wrk/files/patch-Makefile new file mode 100644 index 000000000000..8060f55f08a2 --- /dev/null +++ b/benchmarks/wrk/files/patch-Makefile @@ -0,0 +1,41 @@ +--- Makefile.bak 2013-11-16 07:06:29.000000000 +0400 ++++ Makefile 2013-11-26 07:17:32.000000000 +0400 +@@ -1,5 +1,4 @@ +-CFLAGS := -std=c99 -Wall -O2 -D_REENTRANT +-LIBS := -lpthread -lm -lcrypto -lssl ++LIBS := -pthread -lm -lcrypto -lssl + + TARGET := $(shell uname -s | tr [A-Z] [a-z] 2>/dev/null || echo unknown) + +@@ -23,10 +22,10 @@ + ODIR := obj + OBJ := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o + +-LDIR = deps/luajit/src +-LIBS := -lluajit $(LIBS) +-CFLAGS += -I $(LDIR) +-LDFLAGS += -L $(LDIR) ++#LDIR = deps/luajit/src ++LIBS := -lluajit-5.1 $(LIBS) ++CFLAGS += -I %%PREFIX%%/include/luajit-2.0 ++LDFLAGS += -L %%PREFIX%%/lib + + all: $(BIN) + +@@ -38,14 +37,14 @@ + @echo LINK $(BIN) + @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) + +-$(OBJ): config.h Makefile $(LDIR)/libluajit.a | $(ODIR) ++$(OBJ): config.h Makefile | $(ODIR) + + $(ODIR): + @mkdir -p $@ + + $(ODIR)/bytecode.o: scripts/wrk.lua + @echo LUAJIT $< +- @$(SHELL) -c 'cd $(LDIR) && ./luajit -b $(CURDIR)/$< $(CURDIR)/$@' ++ @$(SHELL) -c 'cd $(LDIR) && %%PREFIX%%/bin/luajit -b $(CURDIR)/$< $(CURDIR)/$@' + + $(ODIR)/%.o : %.c + @echo CC $< |