diff options
Diffstat (limited to 'strata/build-essential/glibc.morph')
-rw-r--r-- | strata/build-essential/glibc.morph | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/strata/build-essential/glibc.morph b/strata/build-essential/glibc.morph index f820547d..5e5614e7 100644 --- a/strata/build-essential/glibc.morph +++ b/strata/build-essential/glibc.morph @@ -20,10 +20,7 @@ products: - (usr/)?lib/libSegFault\.so(\.\d+)*$ - artifact: glibc-libs include: - # This is processed after bins, so bins can take libSegFault.so - (usr/)?lib(32|64)?/lib[^/]*\.so(\.\d+)*$ - - etc/ld.so.conf - - etc/ld.so.conf.d - artifact: glibc-devel include: - (usr/)?include/.* @@ -70,7 +67,6 @@ build-commands: install-commands: - cd o && make install_root="$DESTDIR" localtime=UTC install - mkdir -p "$DESTDIR/etc" -- mkdir -p "$DESTDIR/etc/ld.so.conf.d" - | cat <<EOF > nsswitch.conf passwd: compat @@ -96,3 +92,9 @@ install-commands: include /etc/ld.so.conf.d/*.conf EOF - install -m 644 -o root -g root ld.so.conf "$DESTDIR/etc/ld.so.conf" +# Compatibility symlink to work around the ABI break GLIBC introduced for +# ARMv7 hard-float platforms in commit d3b36017d43. +- case "$MORPH_ARCH" in + armv7*hf*) + ln -s ld-2.20.so "$DESTDIR/lib/ld-linux.so.3" ;; + esac |