mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-01-11 15:00:39 +00:00
arm-toolchain/androidclang: move to libexecdir
Binaries shouldn't be in datadir, and now the RPATHs are being cleared we can put them in libexecdir. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
@@ -25,20 +25,18 @@ BB_STRICT_CHECKSUM = "ignore"
|
||||
|
||||
S = "${WORKDIR}/${ANDROID_CLANG_VERSION}"
|
||||
|
||||
FILES:${PN} = "${datadir} ${bindir}"
|
||||
FILES:${PN} = "${libexecdir} ${bindir}"
|
||||
|
||||
do_install() {
|
||||
# We should really use ${libexecdir} here, but that as some files have invalid RPATH
|
||||
# this results in lots of warning. So using ${datadir} for now
|
||||
install -d ${D}${datadir}/${ANDROID_CLANG_VERSION}/
|
||||
install -d ${D}${libexecdir}/${ANDROID_CLANG_VERSION}/
|
||||
|
||||
cp --no-preserve=ownership -r ${S}/. ${D}${datadir}/${ANDROID_CLANG_VERSION}/
|
||||
cp --no-preserve=ownership -r ${S}/. ${D}${libexecdir}/${ANDROID_CLANG_VERSION}/
|
||||
# Strip bad RPATHs in the embedded python3
|
||||
chrpath -d ${D}${datadir}/${ANDROID_CLANG_VERSION}/python3/lib/python*/lib-dynload/*.so
|
||||
chrpath -d ${D}${libexecdir}/${ANDROID_CLANG_VERSION}/python3/lib/python*/lib-dynload/*.so
|
||||
|
||||
install -d ${D}${bindir}
|
||||
# Symlink all executables into bindir
|
||||
for f in ${D}${datadir}/${ANDROID_CLANG_VERSION}/bin/*; do
|
||||
for f in ${D}${libexecdir}/${ANDROID_CLANG_VERSION}/bin/*; do
|
||||
ln -rs $f ${D}${bindir}/$(basename $f)
|
||||
done
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user