| 1 |
commit: 41c407c3f6a0b41fbfc745227caccd6480eff20d |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 27 01:13:29 2019 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 27 01:13:49 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41c407c3 |
| 7 |
|
| 8 |
sys-libs/glibc: remove version_is_at_least. |
| 9 |
|
| 10 |
As of 2019 Prefix, the conditions are always true. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.73, Repoman-2.3.17 |
| 13 |
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> |
| 14 |
|
| 15 |
sys-libs/glibc/glibc-2.19-r2.ebuild | 52 +++---------------------------------- |
| 16 |
1 file changed, 4 insertions(+), 48 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-libs/glibc/glibc-2.19-r2.ebuild b/sys-libs/glibc/glibc-2.19-r2.ebuild |
| 19 |
index a0b75a595e9..42ed9d4e04d 100644 |
| 20 |
--- a/sys-libs/glibc/glibc-2.19-r2.ebuild |
| 21 |
+++ b/sys-libs/glibc/glibc-2.19-r2.ebuild |
| 22 |
@@ -255,20 +255,10 @@ setup_target_flags() { |
| 23 |
sparc64-*) |
| 24 |
case $(get-flag mcpu) in |
| 25 |
niagara[234]) |
| 26 |
- if version_is_at_least 2.8 ; then |
| 27 |
- cpu="sparc64v2" |
| 28 |
- elif version_is_at_least 2.4 ; then |
| 29 |
- cpu="sparc64v" |
| 30 |
- elif version_is_at_least 2.2.3 ; then |
| 31 |
- cpu="sparc64b" |
| 32 |
- fi |
| 33 |
+ cpu="sparc64v2" |
| 34 |
;; |
| 35 |
niagara) |
| 36 |
- if version_is_at_least 2.4 ; then |
| 37 |
- cpu="sparc64v" |
| 38 |
- elif version_is_at_least 2.2.3 ; then |
| 39 |
- cpu="sparc64b" |
| 40 |
- fi |
| 41 |
+ cpu="sparc64v" |
| 42 |
;; |
| 43 |
ultrasparc3) |
| 44 |
cpu="sparc64b" |
| 45 |
@@ -284,24 +274,10 @@ setup_target_flags() { |
| 46 |
sparc-*) |
| 47 |
case $(get-flag mcpu) in |
| 48 |
niagara[234]) |
| 49 |
- if version_is_at_least 2.8 ; then |
| 50 |
- cpu="sparcv9v2" |
| 51 |
- elif version_is_at_least 2.4 ; then |
| 52 |
- cpu="sparcv9v" |
| 53 |
- elif version_is_at_least 2.2.3 ; then |
| 54 |
- cpu="sparcv9b" |
| 55 |
- else |
| 56 |
- cpu="sparcv9" |
| 57 |
- fi |
| 58 |
+ cpu="sparcv9v2" |
| 59 |
;; |
| 60 |
niagara) |
| 61 |
- if version_is_at_least 2.4 ; then |
| 62 |
- cpu="sparcv9v" |
| 63 |
- elif version_is_at_least 2.2.3 ; then |
| 64 |
- cpu="sparcv9b" |
| 65 |
- else |
| 66 |
- cpu="sparcv9" |
| 67 |
- fi |
| 68 |
+ cpu="sparcv9v" |
| 69 |
;; |
| 70 |
ultrasparc3) |
| 71 |
cpu="sparcv9b" |
| 72 |
@@ -397,25 +373,6 @@ want__thread() { |
| 73 |
return ${WANT__THREAD} |
| 74 |
} |
| 75 |
|
| 76 |
-use_multiarch() { |
| 77 |
- # Make sure binutils is new enough to support indirect functions, |
| 78 |
- # #336792. This funky sed supports gold and bfd linkers. |
| 79 |
- local bver nver |
| 80 |
- bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}') |
| 81 |
- case $(tc-arch ${CTARGET}) in |
| 82 |
- amd64|x86) nver="2.20" ;; |
| 83 |
- arm) nver="2.22" ;; |
| 84 |
- hppa) nver="2.23" ;; |
| 85 |
- ppc|ppc64) nver="2.20" ;; |
| 86 |
- # ifunc support was added in 2.23, but glibc also needs |
| 87 |
- # machinemode which is in 2.24. |
| 88 |
- s390) nver="2.24" ;; |
| 89 |
- sparc) nver="2.21" ;; |
| 90 |
- *) return 1 ;; |
| 91 |
- esac |
| 92 |
- version_is_at_least ${nver} ${bver} |
| 93 |
-} |
| 94 |
- |
| 95 |
# Setup toolchain variables that had historically been defined in the |
| 96 |
# profiles for these archs. |
| 97 |
setup_env() { |
| 98 |
@@ -860,7 +817,6 @@ glibc_do_configure() { |
| 99 |
--libexecdir='$(libdir)'/misc/glibc |
| 100 |
--with-bugurl=https://bugs.gentoo.org/ |
| 101 |
--with-pkgversion="$(glibc_banner)" |
| 102 |
- $(use_multiarch || echo --disable-multi-arch) |
| 103 |
$(use_enable systemtap) |
| 104 |
$(use_enable nscd) |
| 105 |
${EXTRA_ECONF} |
Archives