commit: 632605dca9cd6c3b2b31172f01079871b228d63c Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Wed Jan 15 00:30:22 2020 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Wed Jan 15 00:30:22 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=632605dc
sys-libs/uclibc-ng: fall back on 1.0.30 for arm Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> sys-libs/uclibc-ng/Manifest | 1 + .../files/uclibc-ng-1.0.30-fix-ld.so.cache.patch | 48 ++++++++++++++++++++++ ...ng-1.0.31.ebuild => uclibc-ng-1.0.30-r1.ebuild} | 7 +++- sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild | 4 +- sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild | 2 +- 5 files changed, 57 insertions(+), 5 deletions(-) diff --git a/sys-libs/uclibc-ng/Manifest b/sys-libs/uclibc-ng/Manifest index de7fae1db80..5d5669a9a97 100644 --- a/sys-libs/uclibc-ng/Manifest +++ b/sys-libs/uclibc-ng/Manifest @@ -1,2 +1,3 @@ +DIST uClibc-ng-1.0.30.tar.bz2 2302796 BLAKE2B 21888dfe5a68f83b7ba56bb557ecc5aa19fd75cedc82f2ed48073f47655888719feb27943e0309f8101a24fd2fd9165af31d5679f21c00b12f27ebfccf354bac SHA512 ddd1d91dcfdf7be8471afecf13196563ad348c41e2fa8b63ae50b83f103cf8ed8d9f003b51a54a58db2935b84692b7c011a4779582f30610ede44cb583aae742 DIST uClibc-ng-1.0.31.tar.bz2 2351728 BLAKE2B e2cad8500fdafdd98db11cbc756f3277845fedf545598c9861b1d1ef51b3a24744afe635d6894929eb537891323b0627577c2a5e5dbe1ff0ae588c5aa53a1219 SHA512 489e5f5e8952ebfad1d8a5528a04420d9d2e58fa5092029ccdae91d81dfcf8b3e00092453432da94c76fc18cab542192040bfb271e367fa42ca4926f4b45c372 DIST uClibc-ng-1.0.32.tar.bz2 2352471 BLAKE2B 887b67f7f03fc8610d8236a18f90584720a78bfc3a036cd6616453bea6e31140f5fd1dfd1d207cc5100854bf3e0c5cc1ca38fe6c31cf97b631892767ae23ec27 SHA512 1de5d4e99b94eeeada4233c53a95ea1b9e704ce1d4aa19ca9b17535c0328b2372ed93d24591c6ea5bfbc0b950aa575c18dcf6950fb04342924bb2b5f9ee235e8 diff --git a/sys-libs/uclibc-ng/files/uclibc-ng-1.0.30-fix-ld.so.cache.patch b/sys-libs/uclibc-ng/files/uclibc-ng-1.0.30-fix-ld.so.cache.patch new file mode 100644 index 00000000000..6b13e0890d2 --- /dev/null +++ b/sys-libs/uclibc-ng/files/uclibc-ng-1.0.30-fix-ld.so.cache.patch @@ -0,0 +1,48 @@ +commit 92d250d387e247029900c9074150f45866b29781 +Author: Waldemar Brodkorb <[email protected]> +Date: Sun Apr 29 19:34:11 2018 +0200 + + Revert "ldconfig: add glibc compatibility fix" + + This reverts commit 2a3bb4daf5778c5875674cd26a3c75b3d460a042. + + This is breaking ld.so.cache usage. Seen on Gentoo/amd64. + + Reported-by: "Anthony G. Basile" <[email protected]> + +diff --git a/utils/ldconfig.c b/utils/ldconfig.c +index 58939d689..e6b788118 100644 +--- a/utils/ldconfig.c ++++ b/utils/ldconfig.c +@@ -184,9 +184,10 @@ static char *readsoname(char *name, FILE *infile, int expected_type, + res = readsoname32(name, infile, expected_type, type); + else { + res = readsoname64(name, infile, expected_type, type); +- +- // For 64-bit glibc compatibility +- *type |= FLAG_X8664_LIB64; ++#if 0 ++ /* relies on multilib support which we dont have ... */ ++ *type |= LIB_ELF64; ++#endif + } + + return res; +@@ -757,7 +758,7 @@ void cache_print(void) + + for (fd = 0; fd < header->nlibs; fd++) { + printf("\t%s ", strs + libent[fd].sooffset); +- switch (libent[fd].flags & ~LIB_ELF64 & FLAG_TYPE_MASK) { ++ switch (libent[fd].flags & ~LIB_ELF64) { + case LIB_DLL: + printf("(libc4)"); + break; +@@ -770,7 +771,7 @@ void cache_print(void) + case LIB_ELF_LIBC5: + case LIB_ELF_LIBC6: + printf("(libc%d%s)", +- (libent[fd].flags & ~LIB_ELF64 & FLAG_TYPE_MASK) + 3, ++ (libent[fd].flags & ~LIB_ELF64) + 3, + libent[fd].flags & LIB_ELF64 ? "/64" : ""); + break; + default: diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild similarity index 98% copy from sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild copy to sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild index 36f1b9db8bb..ffc8453e07f 100644 --- a/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild +++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -18,7 +18,7 @@ HOMEPAGE="https://uclibc-ng.org/"; if [[ ${PV} != "9999" ]] ; then PATCH_VER="" SRC_URI="https://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2"; - KEYWORDS="-* amd64 arm ~mips ppc x86" + KEYWORDS="-* ~arm" fi LICENSE="LGPL-2" @@ -253,6 +253,9 @@ src_prepare() { # We want to get rid of this and just have ABI = 0. eapply "${FILESDIR}"/uclibc-compat-r1.patch + # Critical fix for ld.so.cache + eapply "${FILESDIR}"/${P}-fix-ld.so.cache.patch + # We need to change the major.minor.sublevel of uclibc-ng. # Upstream sets MAJOR_VERSION = 1 which breaks runtime linking. # If we really want the ABI bump, we'll have to hack the gcc diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild index 36f1b9db8bb..93b0b01a0fc 100644 --- a/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild +++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -18,7 +18,7 @@ HOMEPAGE="https://uclibc-ng.org/"; if [[ ${PV} != "9999" ]] ; then PATCH_VER="" SRC_URI="https://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2"; - KEYWORDS="-* amd64 arm ~mips ppc x86" + KEYWORDS="-* amd64 ~mips ppc x86" fi LICENSE="LGPL-2" diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild index fae0c97e7b5..82ccf77573e 100644 --- a/sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild +++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="https://uclibc-ng.org/"; if [[ ${PV} != "9999" ]] ; then PATCH_VER="" SRC_URI="https://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2"; - KEYWORDS="-* amd64 -arm ~mips ppc x86" + KEYWORDS="-* amd64 ~mips ppc x86" fi LICENSE="LGPL-2"
