diff options
Diffstat (limited to 'sys-libs/glibc')
| -rw-r--r-- | sys-libs/glibc/Manifest | 4 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.26-r5.ebuild (renamed from sys-libs/glibc/glibc-2.26-r4.ebuild) | 11 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-9999.ebuild | 11 |
3 files changed, 16 insertions, 10 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 0a71506ebe3c..cf90a6e004da 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -45,6 +45,6 @@ EBUILD glibc-2.24-r4.ebuild 5047 BLAKE2B 295eeb6cecff9f9b33d428a3f52d68a5af0c92a EBUILD glibc-2.25-r10.ebuild 4965 BLAKE2B 060110e8a01add709b5fd4892d7cdaeb71ec3a2300b27f21b103933ac60b3118c075a7dba70d8886d363953323be8473f8cc9fb672456c24fa324674465c9534 SHA512 bf04ea4805336e34479195dc136827ff78c752eb415f54b9a23924d28851554ca9bd9c68a8be264a810e7e74e536d43be5645fa54d79fb00ea2714116bf8d9eb EBUILD glibc-2.25-r9.ebuild 5038 BLAKE2B 6bf0e5ad7ff8403fdf35e001418446cb5bc09c4407f28ee04be3e5bf0ab3bb5da57128cea4e4943c81a615b7704ef4e1805d61540b39702702da3723eeee8ada SHA512 e28ab996019d8f3b80523ca4ae2c42857e469ce61eb01d1c248699a37d141223bac5c345b14bd50d18fedd173818d6bc94ab0bcd37aa565cd695bdbbc7dd7b6b EBUILD glibc-2.26-r3.ebuild 25373 BLAKE2B b39fb75551e268f4942457d3aa8a06b7e707032ba68388d8303f43bb047299ce976844384d28c0de7d9a0947a769fe7f96beabb4a60c45790465a0fe4c92a556 SHA512 fb21295d3bc781df3882b3eabb1f3d95d7d1465bfd28a4bd45a79a593c3ad61f042d147c0d1dc835e206a3e0fff975724a1295725fbe81a8718307d315719ccd -EBUILD glibc-2.26-r4.ebuild 25388 BLAKE2B eaa2d151a2320a4b0a599e2feb2cf92c2b366013d4635a4162556e8f9c40eb211674dec9e247bb7b020d34ffb172be792cf38c476aab250dbb06d6335a3ce780 SHA512 7e8974fbc214dd52f16ae210f6e757afe5f8cc915f86405d21ebe32d81b25a3800577463c3c3ef317155e3cb6680fac1c6c6ea61eccc559b95cc064def2db393 -EBUILD glibc-9999.ebuild 25615 BLAKE2B fa6507373cf8c934beca7228b8768cfc573077f416e938e5b36cc5f39894ac9a646b05746548b7b7625f4ee34ffbd165319aaa45768a963c10b8d8654e304826 SHA512 ed0a29a626c9a55432d45a5cc3814b34ee3fae775eb529969810be918f33b0fca4c0bed54d66f07961a0600e1cf8aec67ca611a486f48853376bdd510008a82e +EBUILD glibc-2.26-r5.ebuild 25594 BLAKE2B d127817d3554218ee16cae19a1e959083950675e0aaeadaba9185425f28a17141b5d9a578e28dc4b58a376444a8df41a8fac9632f82382e427adfd755132ff6b SHA512 11196cf14c1891e13bc7b6e2b6e687dfd85c6b59328902bd6adf5e068b87e2c96253408e9d8ba8a8c2b7f47b7818017d43b46411be9ea30231c0708866b19da6 +EBUILD glibc-9999.ebuild 25821 BLAKE2B c52ab7226bd30f3d3cc674575e8022a84c040e04ae5221ef7e479c71dcb5d74c7d721a8d02aecee42341dbf1c2f111ea3d472d9cd33f83b1f4b0d837af8b7cea SHA512 ead08f31af0d81a53203146e7a6001d3c9b8e182a7ab524efb7fe70188fdf4aa0250c65f02b06e996c2cd2ee705ac7f6394ab7f98ed539125c44d048703ca139 MISC metadata.xml 1054 BLAKE2B dbc091e54130729385bc02aaa1025885f101caa88d601b1f7670974d89e7e24aae5d37fd6699278a37c0064e1f3232c04954dc127869427317b5d80b499f3813 SHA512 65474b7d32ceb6bafe8ae0e18aa0b46b68cefecce5570a0e8d4a0117019e6540f2feae35cecbebad382b4f06d6e5ae1dfa9b8a61889881e8534956dd42df8e4b diff --git a/sys-libs/glibc/glibc-2.26-r4.ebuild b/sys-libs/glibc/glibc-2.26-r5.ebuild index 97cf7ef1cbce..abde9e62f95f 100644 --- a/sys-libs/glibc/glibc-2.26-r4.ebuild +++ b/sys-libs/glibc/glibc-2.26-r5.ebuild @@ -607,15 +607,18 @@ glibc_do_src_install() { find "${D}" -name "libnsl.a" -delete find "${D}" -name "libnsl.so" -delete - # Normally real_pv is ${PV}. Live ebuilds are exception, there we need + # Normally upstream_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-${upstream_pv}.a ]] ; then - dosym ../../$(get_libdir)/libm-${upstream_pv}.so $(alt_usrlibdir)/libm-${upstream_pv}.so + # Move versioned .a file out of libdir to evade portage QA checks + # instead of using gen_usr_ldscript(). We fix ldscript as: + # "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..." + sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"$(alt_usrlibdir)/libm.a || die + dodir $(alt_usrlibdir)/${P} + mv "${ED}"$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die fi # We'll take care of the cache ourselves diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index a5bf3b51ebc1..2aed938db026 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -614,15 +614,18 @@ glibc_do_src_install() { find "${D}" -name "libnsl.a" -delete find "${D}" -name "libnsl.so" -delete - # Normally real_pv is ${PV}. Live ebuilds are exception, there we need + # Normally upstream_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-${upstream_pv}.a ]] ; then - dosym ../../$(get_libdir)/libm-${upstream_pv}.so $(alt_usrlibdir)/libm-${upstream_pv}.so + # Move versioned .a file out of libdir to evade portage QA checks + # instead of using gen_usr_ldscript(). We fix ldscript as: + # "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..." + sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"$(alt_usrlibdir)/libm.a || die + dodir $(alt_usrlibdir)/${P} + mv "${ED}"$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die fi # We'll take care of the cache ourselves |