Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/
Date: Thu, 07 Feb 2019 23:02:54
Message-Id: 1549580558.3a821c3499a6f99b780eec2d5dd81c785535600c.slyfox@gentoo
1 commit: 3a821c3499a6f99b780eec2d5dd81c785535600c
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 7 23:01:12 2019 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 7 23:02:38 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a821c34
7
8 sys-libs/glibc: ignore USE=headers-only for native case, bug #677474
9
10 Let's not allow users to "deinstall" native glibc.
11
12 Reported-by: Toralf Förster
13 Closes: https://bugs.gentoo.org/677474
14 Package-Manager: Portage-2.3.59, Repoman-2.3.12
15 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
16
17 sys-libs/glibc/glibc-2.27-r6.ebuild | 4 ++--
18 sys-libs/glibc/glibc-2.28-r5.ebuild | 2 +-
19 sys-libs/glibc/glibc-2.29.ebuild | 2 +-
20 sys-libs/glibc/glibc-9999.ebuild | 2 +-
21 4 files changed, 5 insertions(+), 5 deletions(-)
22
23 diff --git a/sys-libs/glibc/glibc-2.27-r6.ebuild b/sys-libs/glibc/glibc-2.27-r6.ebuild
24 index 7125f84f4da..668e6795b24 100644
25 --- a/sys-libs/glibc/glibc-2.27-r6.ebuild
26 +++ b/sys-libs/glibc/glibc-2.27-r6.ebuild
27 @@ -1,4 +1,4 @@
28 -# Copyright 1999-2018 Gentoo Authors
29 +# Copyright 1999-2019 Gentoo Authors
30 # Distributed under the terms of the GNU General Public License v2
31
32 EAPI=6
33 @@ -459,7 +459,7 @@ setup_env() {
34
35 export ABI=${ABI:-${DEFAULT_ABI:-default}}
36
37 - if use headers-only ; then
38 + if just_headers ; then
39 # Avoid mixing host's CC and target's CFLAGS_${ABI}:
40 # At this bootstrap stage we have only binutils for
41 # target but not compiler yet.
42
43 diff --git a/sys-libs/glibc/glibc-2.28-r5.ebuild b/sys-libs/glibc/glibc-2.28-r5.ebuild
44 index 0c69246759a..827b432313e 100644
45 --- a/sys-libs/glibc/glibc-2.28-r5.ebuild
46 +++ b/sys-libs/glibc/glibc-2.28-r5.ebuild
47 @@ -448,7 +448,7 @@ setup_env() {
48
49 export ABI=${ABI:-${DEFAULT_ABI:-default}}
50
51 - if use headers-only ; then
52 + if just_headers ; then
53 # Avoid mixing host's CC and target's CFLAGS_${ABI}:
54 # At this bootstrap stage we have only binutils for
55 # target but not compiler yet.
56
57 diff --git a/sys-libs/glibc/glibc-2.29.ebuild b/sys-libs/glibc/glibc-2.29.ebuild
58 index 6ef8c8b6f23..3089cdbb5f1 100644
59 --- a/sys-libs/glibc/glibc-2.29.ebuild
60 +++ b/sys-libs/glibc/glibc-2.29.ebuild
61 @@ -452,7 +452,7 @@ setup_env() {
62
63 export ABI=${ABI:-${DEFAULT_ABI:-default}}
64
65 - if use headers-only ; then
66 + if just_headers ; then
67 # Avoid mixing host's CC and target's CFLAGS_${ABI}:
68 # At this bootstrap stage we have only binutils for
69 # target but not compiler yet.
70
71 diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
72 index 6b5bd388a30..1dcf217a492 100644
73 --- a/sys-libs/glibc/glibc-9999.ebuild
74 +++ b/sys-libs/glibc/glibc-9999.ebuild
75 @@ -452,7 +452,7 @@ setup_env() {
76
77 export ABI=${ABI:-${DEFAULT_ABI:-default}}
78
79 - if use headers-only ; then
80 + if just_headers ; then
81 # Avoid mixing host's CC and target's CFLAGS_${ABI}:
82 # At this bootstrap stage we have only binutils for
83 # target but not compiler yet.