[gentoo-commits] repo/gentoo:master commit in: dev-lang/gnat-gpl/files/, dev-lang/gnat-gpl/

[Alfredo Tupone]

commit:     60e4b58db180cbef7dc2c98b607b459afb3af965
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 06:50:30 2019 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> 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 <tupone <AT> 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 <sys/procfs.h>
+ #endif
+ #include <sys/user.h>
+-#include <sys/ustat.h>
+ #include <linux/cyclades.h>
+ #include <linux/if_eql.h>
+ #include <linux/if_plip.h>
+@@ -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 <sys/ustat.h> 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
 }