]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/blob - glibc/patches/glibc-rh1009145.patch
c_icap: Rebuild against libdb
[people/amarx/ipfire-3.x.git] / glibc / patches / glibc-rh1009145.patch
1 --- glibc-2.18-151-g303e567.orig/elf/ldconfig.c 2013-09-25 14:01:01.522446341 -0400
2 +++ glibc-2.18-151-g303e567/elf/ldconfig.c 2013-09-25 14:06:31.094218857 -0400
3 @@ -959,6 +959,16 @@
4 || dlib_ptr->flag == FLAG_ELF_LIBC6)
5 && flag == FLAG_ELF)
6 dlib_ptr->flag = flag;
7 +#ifdef __arm__
8 + /* In Fedora 20 binutils regressed temporarily and failed to
9 + mark hard ABI objects with the correct flag. Therefore we
10 + must accept unmarked objects that were previously marked
11 + hard ABI. We can remove this check once the entire distribution
12 + has been rebuilt. */
13 + else if (dlib_ptr->flag & FLAG_ARM_LIBHF &&
14 + (flag == FLAG_ELF_LIBC6))
15 + ;
16 +#endif
17 else
18 error (0, 0, _("libraries %s and %s in directory %s have same soname but different type."),
19 dlib_ptr->name, direntry->d_name,