diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2021-11-15 00:46:30 +0100 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2021-11-15 00:46:30 +0100 |
| commit | 6473e0a96a03598a9e22904d1fe011913efaac5a (patch) | |
| tree | 959288641178671f4bb53a5d93cfdc44ce020afb | |
| parent | genkernel: Bump to v4.2.5 (diff) | |
| download | genkernel-6473e0a96a03598a9e22904d1fe011913efaac5a.tar.gz genkernel-6473e0a96a03598a9e22904d1fe011913efaac5a.tar.bz2 genkernel-6473e0a96a03598a9e22904d1fe011913efaac5a.zip | |
gen_compile.sh: populate_binpkg(): Use libc.a for testing if glibc has changed
NSS files module was merged into libc in >=glibc-2.34 so it can't be used
to test for changed glibc version anymore.
Using libc.a seems to be the better alternative which we use already in
get_chost_libdir() and depend on in general.
In addition, a check was added to ensure that our glibc test file really
exists (older-than check would pass if our test file would be missing
which is not what we want).
Fixes: 61049d29 ("gen_compile.sh: populate_binpkg(): Throw away binpkg when glibc has changed")
Bug: https://bugs.gentoo.org/823716
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
| -rwxr-xr-x | gen_compile.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gen_compile.sh b/gen_compile.sh index e2b86cc..9af128b 100755 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -515,7 +515,12 @@ populate_binpkg() { if isTrue "$(is_glibc)" then local libdir=$(get_chost_libdir) - local glibc_test_file="${libdir}/libnss_files.so" + local glibc_test_file="${libdir}/libc.a" + + if [[ ! -f "${glibc_test_file}" ]] + then + gen_die "Internal error: File '${glibc_test_file}' not found! Do not know how to deal with this glibc version." + fi if [[ "${BINPKG}" -ot "${glibc_test_file}" ]] then |