1 |
commit: 55b55f614b0ff516547d4ffd111a7a9efa27097a |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 29 17:49:35 2022 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 29 17:49:46 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55b55f61 |
7 |
|
8 |
sys-libs/glibc: Run sanity tests after setting up the environment |
9 |
|
10 |
It makes no sense to use the wrong compiler, for example. |
11 |
|
12 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
13 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
14 |
|
15 |
sys-libs/glibc/glibc-9999.ebuild | 15 ++++++--------- |
16 |
1 file changed, 6 insertions(+), 9 deletions(-) |
17 |
|
18 |
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild |
19 |
index f47aef2712e1..b97550bf18f0 100644 |
20 |
--- a/sys-libs/glibc/glibc-9999.ebuild |
21 |
+++ b/sys-libs/glibc/glibc-9999.ebuild |
22 |
@@ -260,8 +260,8 @@ do_compile_test() { |
23 |
rm -f glibc-test* |
24 |
printf '%b' "$*" > glibc-test.c |
25 |
|
26 |
- # Most of the time CC is already set, but not in early sanity checks. |
27 |
- nonfatal emake glibc-test CC="${CC-$(tc-getCC ${CTARGET})}" |
28 |
+ # We assume CC is already set up. |
29 |
+ nonfatal emake glibc-test |
30 |
ret=$? |
31 |
|
32 |
popd >/dev/null |
33 |
@@ -743,7 +743,7 @@ sanity_prechecks() { |
34 |
ebegin "Checking that IA32 emulation is enabled in the running kernel" |
35 |
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" |
36 |
local STAT |
37 |
- if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then |
38 |
+ if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then |
39 |
"${T}/check-ia32-emulation.elf32" |
40 |
STAT=$? |
41 |
else |
42 |
@@ -809,9 +809,6 @@ upgrade_warning() { |
43 |
# pkg_pretend |
44 |
|
45 |
pkg_pretend() { |
46 |
- # All the checks... |
47 |
- einfo "Checking general environment sanity." |
48 |
- sanity_prechecks |
49 |
upgrade_warning |
50 |
} |
51 |
|
52 |
@@ -823,13 +820,13 @@ pkg_setup() { |
53 |
# src_unpack |
54 |
|
55 |
src_unpack() { |
56 |
- # Consistency is not guaranteed between pkg_ and src_ ... |
57 |
+ setup_env |
58 |
+ |
59 |
+ einfo "Checking general environment sanity." |
60 |
sanity_prechecks |
61 |
|
62 |
use multilib-bootstrap && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz |
63 |
|
64 |
- setup_env |
65 |
- |
66 |
if [[ ${PV} == 9999* ]] ; then |
67 |
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git" |
68 |
EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git |