Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/
Date: Sat, 03 Nov 2018 09:13:14
Message-Id: 1541236064.febf0df98fff29a727f1984d0a3df92946bfcbae.mgorny@gentoo
1 commit: febf0df98fff29a727f1984d0a3df92946bfcbae
2 Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com>
3 AuthorDate: Sun Oct 28 18:39:00 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 3 09:07:44 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=febf0df9
7
8 app-benchmarks/stress-ng: drop old version
9
10 Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12 Closes: https://github.com/gentoo/gentoo/pull/10247
13 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
14
15 app-benchmarks/stress-ng/Manifest | 1 -
16 .../files/stress-ng-0.09.40-makefile.patch | 64 ----------------------
17 app-benchmarks/stress-ng/stress-ng-0.09.41.ebuild | 28 ----------
18 3 files changed, 93 deletions(-)
19
20 diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
21 index ffa5ad81f71..46673cd5a28 100644
22 --- a/app-benchmarks/stress-ng/Manifest
23 +++ b/app-benchmarks/stress-ng/Manifest
24 @@ -1,3 +1,2 @@
25 -DIST stress-ng-0.09.41.tar.xz 359760 BLAKE2B d57d9350744db29d3e61201f146cd6569efae599743cf3e5971d645beba5de99b4162ec735e0f143c1c3cd8cc9e318441bfd97dfcf5db1b26cd7e4543bfcc918 SHA512 d1e2a6442c208d5d32ab688460475a59a2edd73220e44402632650eee022faf5728d282a374f22bcb86ce83662122823a7ba72f9824058d86d9b22a3c1791524
26 DIST stress-ng-0.09.42.tar.xz 360452 BLAKE2B fa5ad15f066d8e762fb08cdcd4fe58ea6604890edf2384e0676e6c35645a6fd84c568369dc966d23527820630a0b44ab9b8969f3e170c876b03a194ea72384af SHA512 e209a8777331f91b3ec5fca9f6f664513498b21b5b31338e0882cc6c79674524906e8d0d4a8931ab5b382feac65e15639989fc0672e408aaa2eb84c72a059258
27 DIST stress-ng-0.09.43.tar.xz 361116 BLAKE2B bba3d136146bfb55f23cb40f85e7e133f96d7fa7f2a55e7b7fb70ef23197c082f89b35fbf11129eaaf3d1c1b7306d1a5ac5ebd55a96c37c6fa9533a84a3d4684 SHA512 bceec4263916b370fc35f6178c2048c3d8317dfc77363f4ec7e9f0111243495d405314af6d467aa5a56db03e1c8c9a2f7aa3c733afe1f3f6f45f6c074ad3ac4c
28
29 diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.09.40-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.40-makefile.patch
30 deleted file mode 100644
31 index e3478e8ced8..00000000000
32 --- a/app-benchmarks/stress-ng/files/stress-ng-0.09.40-makefile.patch
33 +++ /dev/null
34 @@ -1,64 +0,0 @@
35 ---- a/Makefile 2018-09-12 18:12:22.000000000 +0200
36 -+++ b/Makefile 2018-09-16 02:06:13.000000000 +0200
37 -@@ -21,7 +21,7 @@
38 - # Codename "portable pressure producer"
39 - #
40 -
41 --CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99 -pipe
42 -+CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
43 -
44 - #
45 - # Pedantic flags
46 -@@ -338,12 +338,10 @@
47 - .o: stress-ng.h Makefile
48 -
49 - .c.o: stress-ng.h Makefile $(SRC)
50 -- @echo "CC $<"
51 -- @$(CC) $(CFLAGS) -c -o $@ $<
52 -+ $(CC) $(CFLAGS) -c -o $@ $<
53 -
54 - stress-ng: $(OBJS)
55 -- @echo "LD $@"
56 -- @$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@
57 -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@
58 - @sync
59 -
60 - makeconfig:
61 -@@ -364,8 +362,7 @@
62 - sed '$$ s/.$$//' >> apparmor-data.c
63 - @echo "};" >> apparmor-data.c
64 - @echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >> apparmor-data.c
65 -- @echo "CC $<"
66 -- @$(CC) -c apparmor-data.c -o apparmor-data.o
67 -+ $(CC) -c apparmor-data.c -o apparmor-data.o
68 - @rm -rf apparmor-data.c apparmor-data.bin
69 -
70 - #
71 -@@ -380,12 +377,10 @@
72 - perf.o: perf.c perf-event.c
73 - @$(CC) $(CFLAGS) -E perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | \
74 - awk {'print "#define _SNG_" $$1 " (1)"'} > perf-event.h
75 -- @echo CC $<
76 -- @$(CC) $(CFLAGS) -c -o $@ $<
77 -+ $(CC) $(CFLAGS) -c -o $@ $<
78 -
79 - stress-vecmath.o: stress-vecmath.c
80 -- @echo CC $<
81 -- @$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
82 -+ $(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
83 - @touch stress-ng.c
84 -
85 - $(OBJS): stress-ng.h Makefile
86 -@@ -429,10 +424,10 @@
87 - ./stress-ng --seq 0 -t 15 --pathological --verbose --times --tz --metrics
88 -
89 - .PHONY: install
90 --install: stress-ng stress-ng.1.gz
91 -+install: stress-ng
92 - mkdir -p ${DESTDIR}${BINDIR}
93 - cp stress-ng ${DESTDIR}${BINDIR}
94 - mkdir -p ${DESTDIR}${MANDIR}
95 -- cp stress-ng.1.gz ${DESTDIR}${MANDIR}
96 -+ cp stress-ng.1 ${DESTDIR}${MANDIR}
97 - mkdir -p ${DESTDIR}${JOBDIR}
98 - cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR}
99
100 diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.41.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.41.ebuild
101 deleted file mode 100644
102 index 3e47f3a64c7..00000000000
103 --- a/app-benchmarks/stress-ng/stress-ng-0.09.41.ebuild
104 +++ /dev/null
105 @@ -1,28 +0,0 @@
106 -# Copyright 1999-2018 Gentoo Foundation
107 -# Distributed under the terms of the GNU General Public License v2
108 -
109 -EAPI="7"
110 -
111 -DESCRIPTION="Stress test for a computer system with various selectable ways"
112 -HOMEPAGE="http://kernel.ubuntu.com/~cking/stress-ng/"
113 -SRC_URI="http://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
114 -
115 -LICENSE="GPL-2"
116 -SLOT="0"
117 -KEYWORDS="~amd64 ~x86"
118 -
119 -DEPEND="dev-libs/libaio
120 - dev-libs/libbsd
121 - dev-libs/libgcrypt:0=
122 - net-misc/lksctp-tools
123 - sys-apps/attr
124 - sys-apps/keyutils
125 - sys-libs/libapparmor
126 - sys-libs/libcap
127 - sys-libs/zlib:="
128 -
129 -RDEPEND="${DEPEND}"
130 -
131 -DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
132 -
133 -PATCHES=( "${FILESDIR}/${PN}-0.09.40-makefile.patch" )