| 1 |
commit: 5af3499dd3953c3496c0df4543001e7fde9f58e0 |
| 2 |
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 25 21:58:43 2020 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 25 21:59:29 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5af3499d |
| 7 |
|
| 8 |
app-benchmarks/wrk: fix compilation with clang |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/732892 |
| 11 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 12 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 13 |
|
| 14 |
.../wrk/files/wrk-4.1.0-r1-makefile.patch | 37 ------------- |
| 15 |
.../wrk/files/wrk-4.1.0-r2-makefile.patch | 63 ++++++++++++++++++++++ |
| 16 |
app-benchmarks/wrk/wrk-4.1.0-r2.ebuild | 11 ++-- |
| 17 |
3 files changed, 66 insertions(+), 45 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
deleted file mode 100644 |
| 21 |
index 6e7dd317b8f..00000000000 |
| 22 |
--- a/app-benchmarks/wrk/files/wrk-4.1.0-r1-makefile.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,37 +0,0 @@ |
| 25 |
---- a/Makefile 2018-01-21 07:00:58.000000000 +0100 |
| 26 |
-+++ b/Makefile 2018-11-09 11:58:57.000000000 +0100 |
| 27 |
-@@ -1,4 +1,4 @@ |
| 28 |
--CFLAGS += -std=c99 -Wall -O2 -D_REENTRANT |
| 29 |
-+CFLAGS += -std=c99 -Wall -D_REENTRANT |
| 30 |
- LIBS := -lpthread -lm -lssl -lcrypto |
| 31 |
- |
| 32 |
- TARGET := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown) |
| 33 |
-@@ -24,7 +24,7 @@ |
| 34 |
- |
| 35 |
- ODIR := obj |
| 36 |
- OBJ := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o $(ODIR)/version.o |
| 37 |
--LIBS := -lluajit-5.1 $(LIBS) |
| 38 |
-+LIBS := $(shell pkg-config luajit --libs) $(LIBS) |
| 39 |
- |
| 40 |
- DEPS := |
| 41 |
- CFLAGS += -I$(ODIR)/include |
| 42 |
-@@ -51,8 +51,7 @@ |
| 43 |
- $(RM) -rf $(BIN) obj/* |
| 44 |
- |
| 45 |
- $(BIN): $(OBJ) |
| 46 |
-- @echo LINK $(BIN) |
| 47 |
-- @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) |
| 48 |
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) |
| 49 |
- |
| 50 |
- $(OBJ): config.h Makefile $(DEPS) | $(ODIR) |
| 51 |
- |
| 52 |
-@@ -67,8 +66,7 @@ |
| 53 |
- @echo 'const char *VERSION="$(VER)";' | $(CC) -xc -c -o $@ - |
| 54 |
- |
| 55 |
- $(ODIR)/%.o : %.c |
| 56 |
-- @echo CC $< |
| 57 |
-- @$(CC) $(CFLAGS) -c -o $@ $< |
| 58 |
-+ $(CC) $(CFLAGS) -c -o $@ $< |
| 59 |
- |
| 60 |
- # Dependencies |
| 61 |
- |
| 62 |
|
| 63 |
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 |
| 64 |
new file mode 100644 |
| 65 |
index 00000000000..85de3eaf3c3 |
| 66 |
--- /dev/null |
| 67 |
+++ b/app-benchmarks/wrk/files/wrk-4.1.0-r2-makefile.patch |
| 68 |
@@ -0,0 +1,63 @@ |
| 69 |
+--- a/Makefile |
| 70 |
++++ b/Makefile |
| 71 |
+@@ -1,5 +1,5 @@ |
| 72 |
+-CFLAGS += -std=c99 -Wall -O2 -D_REENTRANT |
| 73 |
+-LIBS := -lpthread -lm -lssl -lcrypto |
| 74 |
++CFLAGS += -std=c99 -Wall -D_REENTRANT |
| 75 |
++LIBS := -lm -lssl -lcrypto -lpthread |
| 76 |
+ |
| 77 |
+ TARGET := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown) |
| 78 |
+ |
| 79 |
+@@ -24,15 +24,13 @@ |
| 80 |
+ |
| 81 |
+ ODIR := obj |
| 82 |
+ OBJ := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o $(ODIR)/version.o |
| 83 |
+-LIBS := -lluajit-5.1 $(LIBS) |
| 84 |
++LIBS := $(shell pkg-config luajit --libs) $(LIBS) |
| 85 |
+ |
| 86 |
+ DEPS := |
| 87 |
+ CFLAGS += -I$(ODIR)/include |
| 88 |
+-LDFLAGS += -L$(ODIR)/lib |
| 89 |
+ |
| 90 |
+ ifneq ($(WITH_LUAJIT),) |
| 91 |
+ CFLAGS += -I$(WITH_LUAJIT)/include |
| 92 |
+- LDFLAGS += -L$(WITH_LUAJIT)/lib |
| 93 |
+ else |
| 94 |
+ CFLAGS += -I$(ODIR)/include/luajit-2.1 |
| 95 |
+ DEPS += $(ODIR)/lib/libluajit-5.1.a |
| 96 |
+@@ -40,7 +38,6 @@ |
| 97 |
+ |
| 98 |
+ ifneq ($(WITH_OPENSSL),) |
| 99 |
+ CFLAGS += -I$(WITH_OPENSSL)/include |
| 100 |
+- LDFLAGS += -L$(WITH_OPENSSL)/lib |
| 101 |
+ else |
| 102 |
+ DEPS += $(ODIR)/lib/libssl.a |
| 103 |
+ endif |
| 104 |
+@@ -51,15 +48,14 @@ |
| 105 |
+ $(RM) -rf $(BIN) obj/* |
| 106 |
+ |
| 107 |
+ $(BIN): $(OBJ) |
| 108 |
+- @echo LINK $(BIN) |
| 109 |
+- @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) |
| 110 |
++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) |
| 111 |
+ |
| 112 |
+ $(OBJ): config.h Makefile $(DEPS) | $(ODIR) |
| 113 |
+ |
| 114 |
+ $(ODIR): |
| 115 |
+ @mkdir -p $@ |
| 116 |
+ |
| 117 |
+-$(ODIR)/bytecode.o: src/wrk.lua |
| 118 |
++$(ODIR)/bytecode.c: src/wrk.lua |
| 119 |
+ @echo LUAJIT $< |
| 120 |
+ @$(SHELL) -c 'PATH=obj/bin:$(PATH) luajit -b $(CURDIR)/$< $(CURDIR)/$@' |
| 121 |
+ |
| 122 |
+@@ -67,8 +63,7 @@ |
| 123 |
+ @echo 'const char *VERSION="$(VER)";' | $(CC) -xc -c -o $@ - |
| 124 |
+ |
| 125 |
+ $(ODIR)/%.o : %.c |
| 126 |
+- @echo CC $< |
| 127 |
+- @$(CC) $(CFLAGS) -c -o $@ $< |
| 128 |
++ $(CC) $(CFLAGS) -c -o $@ $< |
| 129 |
+ |
| 130 |
+ # Dependencies |
| 131 |
+ |
| 132 |
|
| 133 |
diff --git a/app-benchmarks/wrk/wrk-4.1.0-r2.ebuild b/app-benchmarks/wrk/wrk-4.1.0-r2.ebuild |
| 134 |
index 23ba20045cb..34bc8be4849 100644 |
| 135 |
--- a/app-benchmarks/wrk/wrk-4.1.0-r2.ebuild |
| 136 |
+++ b/app-benchmarks/wrk/wrk-4.1.0-r2.ebuild |
| 137 |
@@ -32,14 +32,9 @@ BDEPEND=" |
| 138 |
virtual/pkgconfig |
| 139 |
" |
| 140 |
|
| 141 |
-DOCS=( |
| 142 |
- "CHANGES" |
| 143 |
- "NOTICE" |
| 144 |
- "README.md" |
| 145 |
- "SCRIPTING" |
| 146 |
-) |
| 147 |
- |
| 148 |
-PATCHES=( "${FILESDIR}/${P}-r1-makefile.patch" ) |
| 149 |
+DOCS=( "CHANGES" "NOTICE" "README.md" "SCRIPTING" ) |
| 150 |
+ |
| 151 |
+PATCHES=( "${FILESDIR}/${P}-r2-makefile.patch" ) |
| 152 |
|
| 153 |
src_compile() { |
| 154 |
myemakeargs=( |
Archives