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 35143138334 for ; Sat, 20 Apr 2019 23:23:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 371A6E091D; Sat, 20 Apr 2019 23:20:23 +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 F383BE0916 for ; Sat, 20 Apr 2019 23:20:22 +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 47DDD341BAE for ; Sat, 20 Apr 2019 06:50:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B5F94576 for ; Sat, 20 Apr 2019 06:50:46 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1555743030.60e4b58db180cbef7dc2c98b607b459afb3af965.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/gnat-gpl/files/, dev-lang/gnat-gpl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/gnat-gpl/files/gnat-gpl-2017-ustat.patch dev-lang/gnat-gpl/gnat-gpl-2017.ebuild X-VCS-Directories: dev-lang/gnat-gpl/ dev-lang/gnat-gpl/files/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 60e4b58db180cbef7dc2c98b607b459afb3af965 X-VCS-Branch: master Date: Sat, 20 Apr 2019 06:50:46 +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: e910c549-5d16-4cef-bbb3-f6fb1aaabfc7 X-Archives-Hash: 315bb1bd7256fbfd60058e8eecb1190e commit: 60e4b58db180cbef7dc2c98b607b459afb3af965 Author: Tupone Alfredo gentoo org> AuthorDate: Sat Apr 20 06:50:30 2019 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Sat Apr 20 06:50:30 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60e4b58d dev-lang/gnat-gpl: Fix build withouy ustat Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 dev-lang/gnat-gpl/files/gnat-gpl-2017-ustat.patch | 31 +++++++++++++++++++++++ dev-lang/gnat-gpl/gnat-gpl-2017.ebuild | 5 +++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2017-ustat.patch b/dev-lang/gnat-gpl/files/gnat-gpl-2017-ustat.patch new file mode 100644 index 00000000000..505c23b03a0 --- /dev/null +++ b/dev-lang/gnat-gpl/files/gnat-gpl-2017-ustat.patch @@ -0,0 +1,31 @@ +--- a/gcc-6-gpl-2017-src/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2019-04-19 20:53:11.382114157 +0200 ++++ b/gcc-6-gpl-2017-src/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2019-04-19 20:57:10.725037767 +0200 +@@ -150,7 +150,6 @@ + # include + #endif + #include +-#include + #include + #include + #include +@@ -243,7 +242,19 @@ + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +- unsigned struct_ustat_sz = sizeof(struct ustat); ++ // Use pre-computed size of struct ustat to avoid which ++ // has been removed from glibc 2.28. ++#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ ++ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \ ++ || defined(__x86_64__) ++#define SIZEOF_STRUCT_USTAT 32 ++#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \ ++ || defined(__powerpc__) || defined(__s390__) || defined(__sparc__) ++#define SIZEOF_STRUCT_USTAT 20 ++#else ++#error Unknown size of struct ustat ++#endif ++ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT; + unsigned struct_rlimit64_sz = sizeof(struct rlimit64); + unsigned struct_statvfs64_sz = sizeof(struct statvfs64); + #endif // SANITIZER_LINUX && !SANITIZER_ANDROID diff --git a/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild index bdcc9a45caf..92ca3436505 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -125,6 +125,9 @@ src_prepare() { -e 's:$(P) ::g' \ gcc/ada/gcc-interface/Makefile.in \ || die "sed failed" + # fix missing ustat.h + epatch "${FILESDIR}/${P}-ustat.patch" + toolchain_src_prepare }