CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

relocatable.bbclass: Avoid an exception if an empty pkgconfig dir exist

Browse Source 
Rewrite relocatable_native_pcfiles() so that it can handle that any of
the checked pkgconfig directories are empty without causing an
exception.

(From OE-Core rev: f9c5df6dc1c13e9b05ff1b47ad84ad339f6779a4)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Kjellerstedt 2020-03-20 19:04:20 +01:00 committed by Richard Purdie
parent b146adce36
commit 1332ac291d
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
meta/classes/relocatable.bbclass
View File

@ -6,13 +6,15 @@ python relocatable_binaries_preprocess() {
rpath_replace(d.expand('${SYSROOT_DESTDIR}'), d)
}
relocatable_native_pcfiles () {
if [ -d ${SYSROOT_DESTDIR}${libdir}/pkgconfig ]; then
rel=${@os.path.relpath(d.getVar('base_prefix'), d.getVar('libdir') + "/pkgconfig")}
sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" ${SYSROOT_DESTDIR}${libdir}/pkgconfig/*.pc
fi
if [ -d ${SYSROOT_DESTDIR}${datadir}/pkgconfig ]; then
rel=${@os.path.relpath(d.getVar('base_prefix'), d.getVar('datadir') + "/pkgconfig")}
sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" ${SYSROOT_DESTDIR}${datadir}/pkgconfig/*.pc
fi
relocatable_native_pcfiles() {
for dir in ${libdir}/pkgconfig ${datadir}/pkgconfig; do
files_template=${SYSROOT_DESTDIR}$dir/*.pc
# Expand to any files matching $files_template
files=$(echo $files_template)
# $files_template and $files will differ if any files were found
if [ "$files_template" != "$files" ]; then
rel=$(realpath -m --relative-to=$dir ${base_prefix})
sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" $files
fi
done
}