From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EBA001382C5 for ; Sun, 14 Feb 2021 19:53:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4CEEBE0992; Sun, 14 Feb 2021 19:53:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 24867E0992 for ; Sun, 14 Feb 2021 19:53:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E11C6340D69 for ; Sun, 14 Feb 2021 19:53:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B1BF4C7 for ; Sun, 14 Feb 2021 19:53:24 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1613332396.e8bcbfd1e258a80c3437f4b198728e049ae45d68.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/, app-benchmarks/stress-ng/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-benchmarks/stress-ng/Manifest app-benchmarks/stress-ng/files/stress-ng-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild X-VCS-Directories: app-benchmarks/stress-ng/ app-benchmarks/stress-ng/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: e8bcbfd1e258a80c3437f4b198728e049ae45d68 X-VCS-Branch: master Date: Sun, 14 Feb 2021 19:53:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a72cdd7e-4cf6-4808-8253-50c3219b0bb4 X-Archives-Hash: c471077e053b4b87bac56632f3e92db7 commit: e8bcbfd1e258a80c3437f4b198728e049ae45d68 Author: Conrad Kostecki gentoo org> AuthorDate: Sun Feb 14 19:53:05 2021 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sun Feb 14 19:53:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8bcbfd1 app-benchmarks/stress-ng: drop old version Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Conrad Kostecki gentoo.org> app-benchmarks/stress-ng/Manifest | 1 - ....12.02-fix-build-breaking-HAVE_USTAT-typo.patch | 46 ---------------------- app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild | 44 --------------------- 3 files changed, 91 deletions(-) diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest index 115c7ce3290..39ed89124c2 100644 --- a/app-benchmarks/stress-ng/Manifest +++ b/app-benchmarks/stress-ng/Manifest @@ -1,2 +1 @@ -DIST stress-ng-0.12.02.tar.xz 519476 BLAKE2B a56f5e186083fdd2675a13c8ed0e128cb30f0c16787f24dff5db484dbf318d00fe2d9887947b54122e83e8aee3c203c2c8fda4adf6c7c28d0e68b357acb58641 SHA512 074baa898cce4dad898e628e86d7cf29eeef4226bdceddd7e3b05a68327f8fa98df5875434599985049e280f649d2df9a2e0fa7ff32482a800a9fb0ff0c91b7c DIST stress-ng-0.12.03.tar.xz 525156 BLAKE2B 76b56f01670e553acef9caef3c9aea5fb2a0594d9a26694de9aff8d3243494269c82af6d0259cb759dc4763f3faae28f1f06ce797ec07c08a2b8a9516caf7365 SHA512 372de29089645fe80d4b9c17779b7dd0f724d910c898cb181791476e64906cf7713b0cc78d33bb9d4485b02928122590d76f3af731e24923f6b26ce65f862114 diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch b/app-benchmarks/stress-ng/files/stress-ng-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch deleted file mode 100644 index 14498b49449..00000000000 --- a/app-benchmarks/stress-ng/files/stress-ng-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ce1fb7978c836281dd91558f2b4ab3ecee0c253c Mon Sep 17 00:00:00 2001 -From: Adrian Ratiu -Date: Wed, 10 Feb 2021 14:28:00 +0200 -Subject: [PATCH] stress-ng.h: fix build-breaking HAVE_USTAT typo - -This minor typo fails builds on newer glibc because ustat.h does -not exist anymore. - -Signed-off-by: Adrian Ratiu ---- -Backported from stress-ng master commit ce1fb7978c836281d. ---- - core-shim.c | 3 ++- - stress-ng.h | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/core-shim.c b/core-shim.c -index e4e6189d..8af7bcc5 100644 ---- a/core-shim.c -+++ b/core-shim.c -@@ -1390,7 +1390,8 @@ int sys_clone3(struct shim_clone_args *cl_args, size_t size) - - int shim_ustat(dev_t dev, struct shim_ustat *ubuf) - { --#if defined(HAVE_USTAT) -+#if defined(HAVE_USTAT) && \ -+ defined(HAVE_USTAT_H) - return ustat(dev, (void *)ubuf); - #elif defined(__NR_ustat) - return syscall(__NR_ustat, dev, ubuf); -diff --git a/stress-ng.h b/stress-ng.h -index e16a08f0..9d964059 100644 ---- a/stress-ng.h -+++ b/stress-ng.h -@@ -219,7 +219,7 @@ - #include - #endif - --#if defined(HAVE_USTAT) -+#if defined(HAVE_USTAT_H) - #include - #endif - --- -2.30.0 - diff --git a/app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild b/app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild deleted file mode 100644 index ec872d653bd..00000000000 --- a/app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit optfeature toolchain-funcs - -DESCRIPTION="Stress test for a computer system with various selectable ways" -HOMEPAGE="https://kernel.ubuntu.com/~cking/stress-ng/" -SRC_URI="https://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" - -DEPEND=" - dev-libs/libaio - dev-libs/libbsd - dev-libs/libgcrypt:0= - sys-apps/attr - sys-apps/keyutils:= - sys-libs/libcap - sys-libs/zlib -" - -RDEPEND="${DEPEND}" - -DOCS=( "README" "README.Android" "TODO" "syscalls.txt" ) - -PATCHES=( - "${FILESDIR}/${PN}-0.11.23-makefile.patch" - "${FILESDIR}/${PN}-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch" -) - -src_compile() { - tc-export CC - - default -} - -pkg_postinst() { - optfeature "AppArmor support" sys-libs/libapparmor - optfeature "SCTP support" net-misc/lksctp-tools -}