diff options
-rw-r--r-- | meta/recipes-core/glibc/glibc-ld.inc | 4 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc_2.28.bb | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-core/glibc/glibc-ld.inc b/meta/recipes-core/glibc/glibc-ld.inc index bb167b32bc..041ffbb9cb 100644 --- a/meta/recipes-core/glibc/glibc-ld.inc +++ b/meta/recipes-core/glibc/glibc-ld.inc | |||
@@ -10,8 +10,8 @@ def glibc_dl_info(d): | |||
10 | infos['ldconfig'].add('{"' + loader + '",' + "FLAG_ELF_LIBC6" + ' }') | 10 | infos['ldconfig'].add('{"' + loader + '",' + "FLAG_ELF_LIBC6" + ' }') |
11 | infos['lddrewrite'].add(loader) | 11 | infos['lddrewrite'].add(loader) |
12 | 12 | ||
13 | infos['ldconfig'] = ','.join(infos['ldconfig']) | 13 | infos['ldconfig'] = ','.join(sorted(infos['ldconfig'])) |
14 | infos['lddrewrite'] = ' '.join(infos['lddrewrite']) | 14 | infos['lddrewrite'] = ' '.join(sorted(infos['lddrewrite'])) |
15 | return infos | 15 | return infos |
16 | 16 | ||
17 | EGLIBC_KNOWN_INTERPRETER_NAMES = "${@glibc_dl_info(d)['ldconfig']}" | 17 | EGLIBC_KNOWN_INTERPRETER_NAMES = "${@glibc_dl_info(d)['ldconfig']}" |
diff --git a/meta/recipes-core/glibc/glibc_2.28.bb b/meta/recipes-core/glibc/glibc_2.28.bb index d072939254..a107c58b9f 100644 --- a/meta/recipes-core/glibc/glibc_2.28.bb +++ b/meta/recipes-core/glibc/glibc_2.28.bb | |||
@@ -122,10 +122,10 @@ do_compile () { | |||
122 | if [ -n "${RTLDLIST}" ] | 122 | if [ -n "${RTLDLIST}" ] |
123 | then | 123 | then |
124 | prevrtld=`cat ${B}/elf/ldd | grep "^RTLDLIST=" | sed 's#^RTLDLIST="\?\([^"]*\)"\?$#\1#'` | 124 | prevrtld=`cat ${B}/elf/ldd | grep "^RTLDLIST=" | sed 's#^RTLDLIST="\?\([^"]*\)"\?$#\1#'` |
125 | if [ "${prevrtld}" != "${RTLDLIST}" ] | 125 | # remove duplicate entries |
126 | then | 126 | newrtld=`echo $(printf '%s\n' ${prevrtld} ${RTLDLIST} | LC_ALL=C sort -u)` |
127 | sed -i ${B}/elf/ldd -e "s#^RTLDLIST=.*\$#RTLDLIST=\"${prevrtld} ${RTLDLIST}\"#" | 127 | echo "ldd \"${prevrtld} ${RTLDLIST}\" -> \"${newrtld}\"" |
128 | fi | 128 | sed -i ${B}/elf/ldd -e "s#^RTLDLIST=.*\$#RTLDLIST=\"${newrtld}\"#" |
129 | fi | 129 | fi |
130 | 130 | ||
131 | } | 131 | } |