svn commit: r388163 - in head/benchmarks/wrk: . files

[Sergey A. Osokin]

Author: osa
Date: Sun May 31 20:05:25 2015
New Revision: 388163
URL: https://svnweb.freebsd.org/changeset/ports/388163

Log:
  Unhide compiler and linker output.
  Use CFLAGS defined in port's Makefile.
  
  Bump PORTREVISION.

Modified:
  head/benchmarks/wrk/Makefile
  head/benchmarks/wrk/files/patch-Makefile

Modified: head/benchmarks/wrk/Makefile
==============================================================================
--- head/benchmarks/wrk/Makefile	Sun May 31 20:03:19 2015	(r388162)
+++ head/benchmarks/wrk/Makefile	Sun May 31 20:05:25 2015	(r388163)
@@ -3,7 +3,7 @@
 
 PORTNAME=	wrk
 PORTVERSION=	4.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	benchmarks www
 DISTNAME=	${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}

Modified: head/benchmarks/wrk/files/patch-Makefile
==============================================================================
--- head/benchmarks/wrk/files/patch-Makefile	Sun May 31 20:03:19 2015	(r388162)
+++ head/benchmarks/wrk/files/patch-Makefile	Sun May 31 20:05:25 2015	(r388163)
@@ -1,6 +1,14 @@
---- Makefile.orig	2014-08-05 16:50:32.000000000 +0400
-+++ Makefile	2014-09-13 02:29:01.000000000 +0400
-@@ -24,28 +24,28 @@
+--- Makefile.orig	2015-03-24 13:03:52.000000000 +0300
++++ Makefile	2015-05-31 22:58:26.276469000 +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
@@ -18,7 +26,8 @@
  
  $(BIN): $(OBJ)
  	@echo LINK $(BIN)
- 	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+-	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
  
 -$(OBJ): config.h Makefile $(LDIR)/libluajit.a | $(ODIR)
 +$(OBJ): config.h Makefile | $(ODIR)
@@ -29,7 +38,12 @@
  $(ODIR)/bytecode.o: src/wrk.lua
  	@echo LUAJIT $<
 -	@$(SHELL) -c 'cd $(LDIR) && ./luajit -b $(CURDIR)/$< $(CURDIR)/$@'
-+	@$(SHELL) -c 'cd $(LDIR) && ${PREFIX}/bin/luajit -b $(CURDIR)/$< $(CURDIR)/$@'
++	$(SHELL) -c 'cd $(LDIR) && ${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...