summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-02 10:19:51 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-02 10:19:51 +0000
commit29fb3a5d62e40869e4b2622498ec12e5811eadbb (patch)
tree42a4eecb7346d932faffda14da9b16a1f8396f21
parent8ac3ad1c206ffea37fb24d678951505a2b289aa4 (diff)
parenta51a8ee9fe2c691a4b2d73fe06c1fde1d18f1153 (diff)
downloadinfrastructure-29fb3a5d62e40869e4b2622498ec12e5811eadbb.tar.gz
Merge remote-tracking branch 'origin/baserock/sam/armhf-abi-compat' into jetson-mason
-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 789283eb..a4007bd4 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