| 1 |
commit: 735a56979b7cd06cc57f236ab40fa0c04407cfff |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 6 21:37:22 2018 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 6 21:37:36 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=735a5697 |
| 7 |
|
| 8 |
sys-libs/glibc: unbreak cross-compilation |
| 9 |
|
| 10 |
do_run_test() was called unconditionally for all CBUILD/CHOST/CTARGET |
| 11 |
combinations. This broke pkg_setup() for cross-*/glibc ebuild. |
| 12 |
|
| 13 |
Change moves do_run_test() back under native guard. |
| 14 |
|
| 15 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 16 |
|
| 17 |
sys-libs/glibc/glibc-2.27-r1.ebuild | 12 ++++++------ |
| 18 |
sys-libs/glibc/glibc-9999.ebuild | 12 ++++++------ |
| 19 |
2 files changed, 12 insertions(+), 12 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sys-libs/glibc/glibc-2.27-r1.ebuild b/sys-libs/glibc/glibc-2.27-r1.ebuild |
| 22 |
index c22600909bf..2d395119b4b 100644 |
| 23 |
--- a/sys-libs/glibc/glibc-2.27-r1.ebuild |
| 24 |
+++ b/sys-libs/glibc/glibc-2.27-r1.ebuild |
| 25 |
@@ -599,6 +599,12 @@ sanity_prechecks() { |
| 26 |
eerror " Downgrading glibc is not supported and a sure way to destruction." |
| 27 |
die "Aborting to save your system." |
| 28 |
fi |
| 29 |
+ |
| 30 |
+ if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then |
| 31 |
+ eerror "Your old kernel is broken. You need to update it to a newer" |
| 32 |
+ eerror "version as syscall(<bignum>) will break. See bug 279260." |
| 33 |
+ die "Old and broken kernel." |
| 34 |
+ fi |
| 35 |
fi |
| 36 |
|
| 37 |
# Users have had a chance to phase themselves, time to give em the boot |
| 38 |
@@ -615,12 +621,6 @@ sanity_prechecks() { |
| 39 |
die "Please fix your CHOST" |
| 40 |
fi |
| 41 |
|
| 42 |
- if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then |
| 43 |
- eerror "Your old kernel is broken. You need to update it to a newer" |
| 44 |
- eerror "version as syscall(<bignum>) will break. See bug 279260." |
| 45 |
- die "Old and broken kernel." |
| 46 |
- fi |
| 47 |
- |
| 48 |
if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then |
| 49 |
ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS." |
| 50 |
ewarn "This will result in a 50% performance penalty when running with a 32bit" |
| 51 |
|
| 52 |
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild |
| 53 |
index d70a1523ed9..a3f9c3f2edc 100644 |
| 54 |
--- a/sys-libs/glibc/glibc-9999.ebuild |
| 55 |
+++ b/sys-libs/glibc/glibc-9999.ebuild |
| 56 |
@@ -599,6 +599,12 @@ sanity_prechecks() { |
| 57 |
eerror " Downgrading glibc is not supported and a sure way to destruction." |
| 58 |
die "Aborting to save your system." |
| 59 |
fi |
| 60 |
+ |
| 61 |
+ if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then |
| 62 |
+ eerror "Your old kernel is broken. You need to update it to a newer" |
| 63 |
+ eerror "version as syscall(<bignum>) will break. See bug 279260." |
| 64 |
+ die "Old and broken kernel." |
| 65 |
+ fi |
| 66 |
fi |
| 67 |
|
| 68 |
# Users have had a chance to phase themselves, time to give em the boot |
| 69 |
@@ -615,12 +621,6 @@ sanity_prechecks() { |
| 70 |
die "Please fix your CHOST" |
| 71 |
fi |
| 72 |
|
| 73 |
- if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then |
| 74 |
- eerror "Your old kernel is broken. You need to update it to a newer" |
| 75 |
- eerror "version as syscall(<bignum>) will break. See bug 279260." |
| 76 |
- die "Old and broken kernel." |
| 77 |
- fi |
| 78 |
- |
| 79 |
if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then |
| 80 |
ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS." |
| 81 |
ewarn "This will result in a 50% performance penalty when running with a 32bit" |
Archives