diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2017-08-08 16:13:14 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2017-08-08 19:00:58 +0100 |
| commit | b2e5d3cd97d25213ba37fd2e214a89be8559c669 (patch) | |
| tree | 04492525186e1dd689fa2d5e8c6fb84e9bed821b /eclass/toolchain-glibc.eclass | |
| parent | app-crypt/nwipe: version bump (diff) | |
| download | gentoo-b2e5d3cd97d25213ba37fd2e214a89be8559c669.tar.gz gentoo-b2e5d3cd97d25213ba37fd2e214a89be8559c669.tar.bz2 gentoo-b2e5d3cd97d25213ba37fd2e214a89be8559c669.zip | |
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@gentoo.org>
Signed-off-by: Matthias Maier <tamiko@gentoo.org>
Diffstat (limited to 'eclass/toolchain-glibc.eclass')
| -rw-r--r-- | eclass/toolchain-glibc.eclass | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass index 1d6a54a37f14..af516d85d8d6 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 |