From 263bbfc344e7cfee4405ccae8fc21bcdf5fb4e40 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 6 Jan 2019 13:36:20 +0100 Subject: [PATCH] cross-aarch64-linux-gnu: fix incorrect substitutions The lib64 subst was copy pasted from the first one, but only partially modified. And libpthread.so is a real shared library, or a symlink to one, so it should not be modified. Fortunately, according to my builds, nothing in libpthread.so was ever matched, so there was no harm done. And the existing lib64 match already did the trick for that particular case, but fix it anyway, for consistency. This does not result in any difference in the binary build, but it does fix the correctness. --- srcpkgs/cross-aarch64-linux-gnu/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template index 4151d902bea..5856193b17d 100644 --- a/srcpkgs/cross-aarch64-linux-gnu/template +++ b/srcpkgs/cross-aarch64-linux-gnu/template @@ -221,9 +221,9 @@ _gcc_build() { # Make this link to target libs. if [ ! -f .sed_subst_done ]; then sed -e "s, /lib/, ${_sysroot}/lib/,g;s, /usr/lib/, ${_sysroot}/usr/lib/,g" \ - -i ${_sysroot}/lib/libc.so ${_sysroot}/lib/libpthread.so - sed -e "s, /lib64/, ${_sysroot}/lib64/,g;s, /usr/lib/, ${_sysroot}/usr/lib/,g" \ - -i ${_sysroot}/lib/libc.so ${_sysroot}/lib/libpthread.so + -i ${_sysroot}/lib/libc.so + sed -e "s, /lib64/, ${_sysroot}/lib64/,g;s, /usr/lib64/, ${_sysroot}/usr/lib64/,g" \ + -i ${_sysroot}/lib/libc.so touch .sed_subst_done fi