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 EDB2B1382C5 for ; Thu, 11 Feb 2021 16:41:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A3FAE0DA5; Thu, 11 Feb 2021 16:41:14 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 E7485E0DA5 for ; Thu, 11 Feb 2021 16:41:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 DD36433BEDD for ; Thu, 11 Feb 2021 16:41:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 073204AF for ; Thu, 11 Feb 2021 16:41:11 +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: <1613061611.1942d7760fa239b4a94620045fc4320a1fe362d8.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/ X-VCS-Repository: repo/gentoo X-VCS-Files: 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/files/ app-benchmarks/stress-ng/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 1942d7760fa239b4a94620045fc4320a1fe362d8 X-VCS-Branch: master Date: Thu, 11 Feb 2021 16:41:11 +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: e9f92bc5-890c-438e-b466-99e8cd35093e X-Archives-Hash: 94a3ca16e51265eb3501b12aa8ad1c3b commit: 1942d7760fa239b4a94620045fc4320a1fe362d8 Author: Adrian Ratiu collabora com> AuthorDate: Thu Feb 11 11:53:03 2021 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Thu Feb 11 16:40:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1942d776 app-benchmarks/stress-ng: backport newer glibc ustat.h fix Newer glibc has removed ustat.h and stress-ng has a workaround which unfortunately fails due to a minor bug. This backports the fix from upstream because there is no stress-ng release yet containing it. Upstream commit: https://github.com/ColinIanKing/stress-ng/commit/ce1fb7978c836281dd91558f2b4ab3ecee0c253c Closes: https://github.com/gentoo/gentoo/pull/19413 Signed-off-by: Adrian Ratiu collabora.com> Signed-off-by: Conrad Kostecki gentoo.org> ....12.02-fix-build-breaking-HAVE_USTAT-typo.patch | 46 ++++++++++++++++++++++ app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild | 5 ++- 2 files changed, 50 insertions(+), 1 deletion(-) 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 new file mode 100644 index 00000000000..14498b49449 --- /dev/null +++ b/app-benchmarks/stress-ng/files/stress-ng-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch @@ -0,0 +1,46 @@ +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 index 01aaca45b7b..ec872d653bd 100644 --- a/app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild +++ b/app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild @@ -27,7 +27,10 @@ RDEPEND="${DEPEND}" DOCS=( "README" "README.Android" "TODO" "syscalls.txt" ) -PATCHES=( "${FILESDIR}/${PN}-0.11.23-makefile.patch" ) +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