summaryrefslogtreecommitdiff
path: root/app-benchmarks/stress-ng
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-03-27 06:06:27 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-03-27 06:06:27 +0000
commit8d5dbd847cbc704a6a06405856e94b461011afe3 (patch)
tree4d26462d027b14926335894749d2e01d982234d0 /app-benchmarks/stress-ng
parent5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (diff)
gentoo resync : 27.03.2021
Diffstat (limited to 'app-benchmarks/stress-ng')
-rw-r--r--app-benchmarks/stress-ng/Manifest5
-rw-r--r--app-benchmarks/stress-ng/files/stress-ng-0.11.23-makefile.patch60
-rw-r--r--app-benchmarks/stress-ng/stress-ng-0.12.06.ebuild (renamed from app-benchmarks/stress-ng/stress-ng-0.12.05.ebuild)9
3 files changed, 10 insertions, 64 deletions
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 774d630cbfd7..aac573d9e631 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,4 +1,3 @@
-AUX stress-ng-0.11.23-makefile.patch 1635 BLAKE2B 6fd6b90ea16080d5f131724dd9f7128c712e7d6e912d2c8d420fa5c4ff6840e5fffddc18db4977133b0f36f34c5f67e35f106adaef685c0b428d97d37c0e3291 SHA512 15f28bf02fb36e08bdef49b75e413577d226d2e3287560f19c3ce9bb807b3923d7832166156627f5557ca0a1e8e67b9a42177042ad9f1909ec5364e72544d3d3
-DIST stress-ng-0.12.05.tar.xz 529660 BLAKE2B 3ba32dceddeae0910a20fe2a6dda783845059a8d022c372ffef9fc2908ef8b724eb9ce9fef111102f4a07c6f3f05e80560d74285c15a6f82f665a716163b4f1e SHA512 c7be3bfbded5e0d953a02d59fdd983af46e9588b21c4858b26a9432b72f4c6bd5710f5294372746adcb52aeb8d0e9800c99c3256d269b25458af31591f63a758
-EBUILD stress-ng-0.12.05.ebuild 856 BLAKE2B c7d3eed51df12a6666b25ea973bef5a4d81e52e152c875e553891c18ba23fd76a87372b3e9e8e37e61ca676c0e1e42e72b28623b5016f851b3186f627b5e16f8 SHA512 229e156332d957b8ebf8c8f9e89fb6a976de1ed76fcdb4f68e1560286ad9d225a33f60e8ee4bd6fd4a56c8ae98fb92c97665425958c4f6eff2d9f49e72c46f90
+DIST stress-ng-0.12.06.tar.xz 530940 BLAKE2B dcf1c97df38cdfd15c88fa71497477d83a0ab8e18ca506717f360b8a1f284be00163f6de956d686cdd6d479bd6fb2075ec2dc4dea55b4af4c623caf4a412e7a0 SHA512 bdfbee6c1d339dc4d288aa28b08bdaf158f49bb023b527c653e7956d80607690fe4aab763acc8c6659e822f2e225ee2be39ff60effa972b05c4c5e0fe067d6fc
+EBUILD stress-ng-0.12.06.ebuild 975 BLAKE2B 0eb53df04bdcba13dfd0094cec49b5b7810f57120c2be614e91e9ef9757ecd4cd38c6d7a14bd42359c15693fe50794cbddd679be34cdffc5e4a7d4b0261f3b20 SHA512 9270479a8843a12a58055b276582028a9eb79036365dcfee833536e522aac3ecc287dd8bba88fcab86a56ce9ac0fa0fa355fc21c3811d0060c92bd1ba6f215f7
MISC metadata.xml 834 BLAKE2B 01f0258893808f35495d063d634b3fecbb47e94cc6915ea605eedd6565e860bd42cbf181afa25e6e2faba396aa4c6da5d4e489af40bf5b11bd2ebb4e363e6994 SHA512 17c422c00bae52d5305ec4c34452c2bf86f280f2fcfa8c26710356023115828092d1d6f321e8ee194801b2d31413e07416041632ef692ad4128f8f99e389efb1
diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.11.23-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.11.23-makefile.patch
deleted file mode 100644
index 77687d2a1141..000000000000
--- a/app-benchmarks/stress-ng/files/stress-ng-0.11.23-makefile.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -21,7 +21,7 @@
- # Codename "synthetic system strainer"
- #
-
--CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99
-+CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
-
- #
- # Pedantic flags
-@@ -364,12 +364,10 @@
- .o: stress-ng.h Makefile
-
- .c.o:
-- @echo "CC $<"
-- @$(CC) $(CFLAGS) -c -o $@ $<
-+ $(CC) $(CFLAGS) -c -o $@ $<
-
- stress-ng: $(OBJS)
-- @echo "LD $@"
-- @$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@
-+ $(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@
- @sync
-
- makeconfig:
-@@ -390,8 +388,7 @@
- sed '$$ s/.$$//' >> apparmor-data.c
- @echo "};" >> apparmor-data.c
- @echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >> apparmor-data.c
-- @echo "CC $<"
-- @$(CC) -c apparmor-data.c -o apparmor-data.o
-+ $(CC) -c apparmor-data.c -o apparmor-data.o
- @rm -rf apparmor-data.c apparmor-data.bin
-
- #
-@@ -419,12 +416,10 @@
- @$(CC) $(CFLAGS) -E core-perf-event.c | $(GREP) "PERF_COUNT" | \
- sed 's/,/ /' | sed s/'^ *//' | \
- awk {'print "#define _SNG_" $$1 " (1)"'} > core-perf-event.h
-- @echo CC $<
-- @$(CC) $(CFLAGS) -c -o $@ $<
-+ $(CC) $(CFLAGS) -c -o $@ $<
-
- stress-vecmath.o: stress-vecmath.c
-- @echo CC $<
-- @$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
-+ $(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
-
- $(OBJS): stress-ng.h Makefile
-
-@@ -478,7 +473,7 @@
- mkdir -p ${DESTDIR}${BINDIR}
- cp stress-ng ${DESTDIR}${BINDIR}
- mkdir -p ${DESTDIR}${MANDIR}
-- cp stress-ng.1.gz ${DESTDIR}${MANDIR}
-+ cp stress-ng.1 ${DESTDIR}${MANDIR}
- mkdir -p ${DESTDIR}${JOBDIR}
- cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR}
- mkdir -p ${DESTDIR}${BASHDIR}
diff --git a/app-benchmarks/stress-ng/stress-ng-0.12.05.ebuild b/app-benchmarks/stress-ng/stress-ng-0.12.06.ebuild
index 01aaca45b7b8..073bfbc1f4a8 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.12.05.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.12.06.ebuild
@@ -27,9 +27,16 @@ RDEPEND="${DEPEND}"
DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
-PATCHES=( "${FILESDIR}/${PN}-0.11.23-makefile.patch" )
+src_prepare() {
+ default
+
+ # Don't install compressed man page.
+ # Respect users CFLAGS.
+ sed -e 's/stress-ng.1.gz/stress-ng.1/' -e 's/-O2//' -i Makefile
+}
src_compile() {
+ export VERBOSE=1
tc-export CC
default