Diff glibc-2.37-r3 with a glibc-2.37-r7
/usr/portage/sys-libs/glibc/glibc-2.37-r7.ebuild 2023-10-09 14:52:35.544368503 +0300 | ||
---|---|---|
20 | 20 |
EMULTILIB_PKG="true" |
21 | 21 | |
22 | 22 |
# Gentoo patchset (ignored for live ebuilds) |
23 |
PATCH_VER=5 |
|
23 |
PATCH_VER=10 |
|
24 | 24 |
PATCH_DEV=dilfridge |
25 | 25 | |
26 | 26 |
# gcc mulitilib bootstrap files version |
... | ... | |
39 | 39 |
if [[ ${PV} == 9999* ]]; then |
40 | 40 |
inherit git-r3 |
41 | 41 |
else |
42 |
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" |
|
42 |
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" |
|
43 | 43 |
SRC_URI="mirror://gnu/glibc/${P}.tar.xz" |
44 | 44 |
SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz" |
45 | 45 |
fi |
... | ... | |
170 | 170 |
tst-strsignal |
171 | 171 |
) |
172 | 172 | |
173 |
XFAIL_NSPAWN_TEST_LIST=( |
|
174 |
# These tests need to be adapted to handle EPERM/ENOSYS(?) properly |
|
175 |
# upstream, as systemd-nspawn's default seccomp whitelist is too strict. |
|
176 |
# https://sourceware.org/PR30603 |
|
177 |
test-errno-linux |
|
178 |
tst-bz21269 |
|
179 |
tst-mlock2 |
|
180 |
tst-ntp_gettime |
|
181 |
tst-ntp_gettime-time64 |
|
182 |
tst-ntp_gettimex |
|
183 |
tst-ntp_gettimex-time64 |
|
184 |
tst-pkey |
|
185 |
tst-process_mrelease |
|
186 |
tst-adjtime |
|
187 |
tst-adjtime-time64 |
|
188 |
tst-clock2 |
|
189 |
tst-clock2-time64 |
|
190 | ||
191 |
# These fail if --suppress-sync and/or low priority is set |
|
192 |
tst-sync_file_range |
|
193 |
tst-sched1 |
|
194 |
test-errno |
|
195 |
) |
|
196 | ||
173 | 197 |
# |
174 | 198 |
# Small helper functions |
175 | 199 |
# |
... | ... | |
840 | 864 |
} |
841 | 865 | |
842 | 866 |
upgrade_warning() { |
867 |
is_crosscompile && return |
|
868 | ||
843 | 869 |
if [[ ${MERGE_TYPE} != buildonly && -n ${REPLACING_VERSIONS} && -z ${ROOT} ]]; then |
844 | 870 |
local oldv newv=$(ver_cut 1-2 ${PV}) |
845 | 871 |
for oldv in ${REPLACING_VERSIONS}; do |
... | ... | |
1225 | 1251 | |
1226 | 1252 |
local myxfailparams="" |
1227 | 1253 |
if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then |
1254 |
local virt=$(systemd-detect-virt 2>/dev/null) |
|
1255 |
if [[ ${virt} == systemd-nspawn ]] ; then |
|
1256 |
ewarn "Skipping extra tests because in systemd-nspawn container" |
|
1257 |
XFAIL_TEST_LIST+=( "${XFAIL_NSPAWN_TEST_LIST[@]}" ) |
|
1258 |
fi |
|
1259 | ||
1228 | 1260 |
for myt in ${XFAIL_TEST_LIST[@]} ; do |
1229 | 1261 |
myxfailparams+="test-xfail-${myt}=yes " |
1230 | 1262 |
done |