| 1 |
commit: 621ef8ab87d3bc72e9baf8b36c392872492e9afd |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 11 22:58:15 2018 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 11 22:58:53 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=621ef8ab |
| 7 |
|
| 8 |
sys-libs/glibc: Port to eapi7-ver. 2.28 patchlevel bump. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 11 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-libs/glibc/Manifest | 1 + |
| 14 |
.../{glibc-9999.ebuild => glibc-2.28-r3.ebuild} | 28 +++++++++++----------- |
| 15 |
sys-libs/glibc/glibc-9999.ebuild | 24 +++++++++---------- |
| 16 |
3 files changed, 27 insertions(+), 26 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest |
| 19 |
index 42c459898d3..ea1782dc999 100644 |
| 20 |
--- a/sys-libs/glibc/Manifest |
| 21 |
+++ b/sys-libs/glibc/Manifest |
| 22 |
@@ -17,5 +17,6 @@ DIST glibc-2.26.tar.xz 14682748 BLAKE2B c1c9dbec110dd4e25b2f463a96d8afc43b8e3ebf |
| 23 |
DIST glibc-2.27-patches-3.tar.bz2 166511 BLAKE2B 1dc54bef6e82112935c7411f7a5cd07c1edb24c3edaa1e0243b846b3832a40af1ba3a7b77aef04c54a173388156b464ea442fa8310a02e6f44e2ed5b78994286 SHA512 12496e9b0c60630dbec4c2febdd6d20df1f3d7a2c243cc55b595202b27f682b9208e16cd8c387687c0cc9e18b36c3caeef8d1b1148eb3ee8081431997270db5e |
| 24 |
DIST glibc-2.27.tar.xz 15395316 BLAKE2B ea206d304c8c9aa86d69db981a14bea008602cea06a6c151c4971a8df059949ffe5632b42a67ab0ffcd7c4d7ce1ec02ac48815dac4dade1c4dd41eaee8a6ed33 SHA512 7c5581154487d38d173ce1feb944e60207139cca148bccf066eaae322c0c2d219423bdcfa15c7f9be1b5e45dfc43c641cc5d80d3c3c65837d08a83cdb4e2a147 |
| 25 |
DIST glibc-2.28-patches-3.tar.xz 46172 BLAKE2B b2dc4de76ab4b4e31a6a043a133f89ede736cf3f21fb3d3091dabf282b2d70f6d017a4aec37319febb2a43c89176887a0920f2aa174fa98c66ad59cbe19ba493 SHA512 4a40a15f0e8d9ad9d33ea07addc3f07fb952bc9c110549815fb0e78cab818bc64bc8d9150874a80c249bf5765a7a2bb9b6ccfb8bc7b12f30e3807e528506cd71 |
| 26 |
+DIST glibc-2.28-patches-4.tar.xz 76356 BLAKE2B b9bc6f89d2917f6a2247208ff470c33fa9010838332d9e3229ab7d912a55cb6c2ba6f8c344ed0a2df24924bab68af6b305914adda0b61301f4fc7b2e9ce76cb0 SHA512 5a088cd6b659d605c7445dfd952724533c91d59a05e1c24e505cdcdd3807b00c82ee72cc28b5b3c0a31e55e1c13c48e63779a528dd77b0ffafec62edc829a6cd |
| 27 |
DIST glibc-2.28.tar.xz 16484344 BLAKE2B 9aa8cbd5a145c2a6fde3a60b3d0a14b12b46ed79333ad1ca3e73464adcfe700277a17a9e7fd0ca36e355a0c5b0b27decfa091da320ba802741ad75cc955bbcc8 SHA512 521f820953ff07c69ece4c2186f59fc061a7f9747932cd70ef2995c2b2deee76eeb6de700d85071cdca5949179aa8ccee75eda7feca1394121ec7b821ad0a3f3 |
| 28 |
DIST glibc-9999-patches-8.tar.xz 14708 BLAKE2B 6c468f11f5b85460219f56ac694e1d3dc3de9a2a23daf7d4f2c715e1b9189bd7a5383093fd8076c2456f9ac0874cb0e2daad8fb360a62038e763a87234f95d95 SHA512 172ab4bc2e716900224b699c9ef89629ffc12756cb72fb7d9628e0ea8fc840cfb2da20ca69fa6c6e1a709f7e2a990bb0f85c32b6ace6fd2d57e2242471900e30 |
| 29 |
|
| 30 |
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-2.28-r3.ebuild |
| 31 |
similarity index 98% |
| 32 |
copy from sys-libs/glibc/glibc-9999.ebuild |
| 33 |
copy to sys-libs/glibc/glibc-2.28-r3.ebuild |
| 34 |
index 9284afea866..40b8b2271af 100644 |
| 35 |
--- a/sys-libs/glibc/glibc-9999.ebuild |
| 36 |
+++ b/sys-libs/glibc/glibc-2.28-r3.ebuild |
| 37 |
@@ -3,7 +3,7 @@ |
| 38 |
|
| 39 |
EAPI=6 |
| 40 |
|
| 41 |
-inherit prefix eutils versionator toolchain-funcs flag-o-matic gnuconfig \ |
| 42 |
+inherit prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuconfig \ |
| 43 |
multilib systemd multiprocessing |
| 44 |
|
| 45 |
DESCRIPTION="GNU libc C library" |
| 46 |
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999* ]]; then |
| 47 |
EGIT_REPO_URI="https://sourceware.org/git/glibc.git" |
| 48 |
inherit git-r3 |
| 49 |
else |
| 50 |
- # KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 51 |
+ #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 52 |
KEYWORDS="" |
| 53 |
SRC_URI="mirror://gnu/glibc/${P}.tar.xz" |
| 54 |
fi |
| 55 |
@@ -28,7 +28,7 @@ RELEASE_VER=${PV} |
| 56 |
GCC_BOOTSTRAP_VER=20180511 |
| 57 |
|
| 58 |
# Gentoo patchset |
| 59 |
-PATCH_VER=8 |
| 60 |
+PATCH_VER=4 |
| 61 |
|
| 62 |
SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.xz" |
| 63 |
SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )" |
| 64 |
@@ -259,18 +259,18 @@ setup_target_flags() { |
| 65 |
sparc64-*) |
| 66 |
case $(get-flag mcpu) in |
| 67 |
niagara[234]) |
| 68 |
- if version_is_at_least 2.8 ; then |
| 69 |
+ if ver_test -ge 2.8 ; then |
| 70 |
cpu="sparc64v2" |
| 71 |
- elif version_is_at_least 2.4 ; then |
| 72 |
+ elif ver_test -ge 2.4 ; then |
| 73 |
cpu="sparc64v" |
| 74 |
- elif version_is_at_least 2.2.3 ; then |
| 75 |
+ elif ver_test -ge 2.2.3 ; then |
| 76 |
cpu="sparc64b" |
| 77 |
fi |
| 78 |
;; |
| 79 |
niagara) |
| 80 |
- if version_is_at_least 2.4 ; then |
| 81 |
+ if ver_test -ge 2.4 ; then |
| 82 |
cpu="sparc64v" |
| 83 |
- elif version_is_at_least 2.2.3 ; then |
| 84 |
+ elif ver_test -ge 2.2.3 ; then |
| 85 |
cpu="sparc64b" |
| 86 |
fi |
| 87 |
;; |
| 88 |
@@ -288,20 +288,20 @@ setup_target_flags() { |
| 89 |
sparc-*) |
| 90 |
case $(get-flag mcpu) in |
| 91 |
niagara[234]) |
| 92 |
- if version_is_at_least 2.8 ; then |
| 93 |
+ if ver_test -ge 2.8 ; then |
| 94 |
cpu="sparcv9v2" |
| 95 |
- elif version_is_at_least 2.4 ; then |
| 96 |
+ elif ver_test -ge 2.4 ; then |
| 97 |
cpu="sparcv9v" |
| 98 |
- elif version_is_at_least 2.2.3 ; then |
| 99 |
+ elif ver_test -ge 2.2.3 ; then |
| 100 |
cpu="sparcv9b" |
| 101 |
else |
| 102 |
cpu="sparcv9" |
| 103 |
fi |
| 104 |
;; |
| 105 |
niagara) |
| 106 |
- if version_is_at_least 2.4 ; then |
| 107 |
+ if ver_test -ge 2.4 ; then |
| 108 |
cpu="sparcv9v" |
| 109 |
- elif version_is_at_least 2.2.3 ; then |
| 110 |
+ elif ver_test -ge 2.2.3 ; then |
| 111 |
cpu="sparcv9b" |
| 112 |
else |
| 113 |
cpu="sparcv9" |
| 114 |
@@ -433,7 +433,7 @@ use_multiarch() { |
| 115 |
sparc) nver="2.21" ;; |
| 116 |
*) return 1 ;; |
| 117 |
esac |
| 118 |
- version_is_at_least ${nver} ${bver} |
| 119 |
+ ver_test ${bver} -ge ${nver} |
| 120 |
} |
| 121 |
|
| 122 |
# Setup toolchain variables that had historically been defined in the |
| 123 |
|
| 124 |
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild |
| 125 |
index 9284afea866..61685dd31e1 100644 |
| 126 |
--- a/sys-libs/glibc/glibc-9999.ebuild |
| 127 |
+++ b/sys-libs/glibc/glibc-9999.ebuild |
| 128 |
@@ -3,7 +3,7 @@ |
| 129 |
|
| 130 |
EAPI=6 |
| 131 |
|
| 132 |
-inherit prefix eutils versionator toolchain-funcs flag-o-matic gnuconfig \ |
| 133 |
+inherit prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuconfig \ |
| 134 |
multilib systemd multiprocessing |
| 135 |
|
| 136 |
DESCRIPTION="GNU libc C library" |
| 137 |
@@ -259,18 +259,18 @@ setup_target_flags() { |
| 138 |
sparc64-*) |
| 139 |
case $(get-flag mcpu) in |
| 140 |
niagara[234]) |
| 141 |
- if version_is_at_least 2.8 ; then |
| 142 |
+ if ver_test -ge 2.8 ; then |
| 143 |
cpu="sparc64v2" |
| 144 |
- elif version_is_at_least 2.4 ; then |
| 145 |
+ elif ver_test -ge 2.4 ; then |
| 146 |
cpu="sparc64v" |
| 147 |
- elif version_is_at_least 2.2.3 ; then |
| 148 |
+ elif ver_test -ge 2.2.3 ; then |
| 149 |
cpu="sparc64b" |
| 150 |
fi |
| 151 |
;; |
| 152 |
niagara) |
| 153 |
- if version_is_at_least 2.4 ; then |
| 154 |
+ if ver_test -ge 2.4 ; then |
| 155 |
cpu="sparc64v" |
| 156 |
- elif version_is_at_least 2.2.3 ; then |
| 157 |
+ elif ver_test -ge 2.2.3 ; then |
| 158 |
cpu="sparc64b" |
| 159 |
fi |
| 160 |
;; |
| 161 |
@@ -288,20 +288,20 @@ setup_target_flags() { |
| 162 |
sparc-*) |
| 163 |
case $(get-flag mcpu) in |
| 164 |
niagara[234]) |
| 165 |
- if version_is_at_least 2.8 ; then |
| 166 |
+ if ver_test -ge 2.8 ; then |
| 167 |
cpu="sparcv9v2" |
| 168 |
- elif version_is_at_least 2.4 ; then |
| 169 |
+ elif ver_test -ge 2.4 ; then |
| 170 |
cpu="sparcv9v" |
| 171 |
- elif version_is_at_least 2.2.3 ; then |
| 172 |
+ elif ver_test -ge 2.2.3 ; then |
| 173 |
cpu="sparcv9b" |
| 174 |
else |
| 175 |
cpu="sparcv9" |
| 176 |
fi |
| 177 |
;; |
| 178 |
niagara) |
| 179 |
- if version_is_at_least 2.4 ; then |
| 180 |
+ if ver_test -ge 2.4 ; then |
| 181 |
cpu="sparcv9v" |
| 182 |
- elif version_is_at_least 2.2.3 ; then |
| 183 |
+ elif ver_test -ge 2.2.3 ; then |
| 184 |
cpu="sparcv9b" |
| 185 |
else |
| 186 |
cpu="sparcv9" |
| 187 |
@@ -433,7 +433,7 @@ use_multiarch() { |
| 188 |
sparc) nver="2.21" ;; |
| 189 |
*) return 1 ;; |
| 190 |
esac |
| 191 |
- version_is_at_least ${nver} ${bver} |
| 192 |
+ ver_test ${bver} -ge ${nver} |
| 193 |
} |
| 194 |
|
| 195 |
# Setup toolchain variables that had historically been defined in the |
Archives