summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-02 13:47:29 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-02 13:47:29 (GMT)
commit1a0bb1979fa5863c2c19bcf2ab62449a1fa96277 (patch)
tree98f1f423812d735480089645862d4d378c756b31
parent3d0e225e7d5db6edc456dd28f13cbf388e9c1929 (diff)
parenta51a8ee9fe2c691a4b2d73fe06c1fde1d18f1153 (diff)
downloaddefinitions-1a0bb1979fa5863c2c19bcf2ab62449a1fa96277.tar.gz
Merge branch 'baserock/sam/armhf-abi-compat'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk> Reviewed-By: Richard Dale <richard.dale@codethink.co.uk>
-rw-r--r--strata/build-essential/glibc.morph6
1 files changed, 6 insertions, 0 deletions
diff --git a/strata/build-essential/glibc.morph b/strata/build-essential/glibc.morph
index 789283e..a4007bd 100644
--- a/strata/build-essential/glibc.morph
+++ b/strata/build-essential/glibc.morph
@@ -84,3 +84,9 @@ install-commands:
netgroup: nis
EOF
- install -m 644 -o root -g root nsswitch.conf "$DESTDIR/etc/nsswitch.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