sys-libs/glibc: ignore USE=headers-only for native case, bug #677474

Let's not allow users to "deinstall" native glibc.

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/677474
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

diff --git a/sys-libs/glibc/glibc-2.27-r6.ebuild b/sys-libs/glibc/glibc-2.27-r6.ebuild
index 7125f84f4dabe66949cfde674cf00bf0e42f4216..668e6795b2437852804ddfbe4109b0471f513a9c 100644 (file)
--- a/sys-libs/glibc/glibc-2.27-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.27-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -459,7 +459,7 @@ setup_env() {
 
        export ABI=${ABI:-${DEFAULT_ABI:-default}}
 
-       if use headers-only ; then
+       if just_headers ; then
                # Avoid mixing host's CC and target's CFLAGS_${ABI}:
                # At this bootstrap stage we have only binutils for
                # target but not compiler yet.

diff --git a/sys-libs/glibc/glibc-2.28-r5.ebuild b/sys-libs/glibc/glibc-2.28-r5.ebuild
index 0c69246759a4f6f503f8e34e5836caeff1ff4903..827b432313ee46c5ac5e4a2199153f65dd7f09df 100644 (file)
--- a/sys-libs/glibc/glibc-2.28-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.28-r5.ebuild
@@ -448,7 +448,7 @@ setup_env() {
 
        export ABI=${ABI:-${DEFAULT_ABI:-default}}
 
-       if use headers-only ; then
+       if just_headers ; then
                # Avoid mixing host's CC and target's CFLAGS_${ABI}:
                # At this bootstrap stage we have only binutils for
                # target but not compiler yet.

diff --git a/sys-libs/glibc/glibc-2.29.ebuild b/sys-libs/glibc/glibc-2.29.ebuild
index 6ef8c8b6f2305598affda4df23c3c09f735cfaab..3089cdbb5f1a99faef645ecaa2a8283fe429be5d 100644 (file)
--- a/sys-libs/glibc/glibc-2.29.ebuild
+++ b/sys-libs/glibc/glibc-2.29.ebuild
@@ -452,7 +452,7 @@ setup_env() {
 
        export ABI=${ABI:-${DEFAULT_ABI:-default}}
 
-       if use headers-only ; then
+       if just_headers ; then
                # Avoid mixing host's CC and target's CFLAGS_${ABI}:
                # At this bootstrap stage we have only binutils for
                # target but not compiler yet.

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 6b5bd388a30ee6a704c3db16bfba04aef5568818..1dcf217a492ea1554f93426fbe3a351b6a4ef741 100644 (file)
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -452,7 +452,7 @@ setup_env() {
 
        export ABI=${ABI:-${DEFAULT_ABI:-default}}
 
-       if use headers-only ; then
+       if just_headers ; then
                # Avoid mixing host's CC and target's CFLAGS_${ABI}:
                # At this bootstrap stage we have only binutils for
                # target but not compiler yet.