commit: b2e5d3cd97d25213ba37fd2e214a89be8559c669 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Tue Aug 8 15:13:14 2017 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Tue Aug 8 18:00:58 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2e5d3cd
toolchain-glibc.eclass: fix libm.so symlinking for live glibc The failure happens when live glibc-9999 ebuild is installed: * QA Notice: Missing gen_usr_ldscript for libm-2.26.90.so * ERROR: sys-libs/glibc-9999::gentoo failed: * add those ldscripts The problem here is how upstream glibc version is detected: dosym ../../$(get_libdir)/libm-${PV}.so $(alt_usrlibdir)/libm-${PV}.so Change to use 'version.h' to pick upstream version. Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> eclass/toolchain-glibc.eclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass index 1d6a54a37f1..af516d85d8d 100644 --- a/eclass/toolchain-glibc.eclass +++ b/eclass/toolchain-glibc.eclass @@ -1138,10 +1138,14 @@ toolchain-glibc_do_src_install() { cp -a elf/ld.so "${ED}"$(alt_libdir)/$(scanelf -qSF'%S#F' elf/ld.so) || die "copying nptl interp" fi + # Normally real_pv is ${PV}. Live ebuilds are exception, there we need + # to infer upstream version: + # '#define VERSION "2.26.90"' -> '2.26.90' + local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h) # Newer versions get fancy with libm linkage to include vectorized support. # While we don't really need a ldscript here, portage QA checks get upset. - if [[ -e ${ED}$(alt_usrlibdir)/libm-${PV}.a ]] ; then - dosym ../../$(get_libdir)/libm-${PV}.so $(alt_usrlibdir)/libm-${PV}.so + if [[ -e ${ED}$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then + dosym ../../$(get_libdir)/libm-${upstream_pv}.so $(alt_usrlibdir)/libm-${upstream_pv}.so fi # We'll take care of the cache ourselves