summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <pkj@axis.com>2020-03-20 18:04:20 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-08 09:47:50 (GMT)
commitab252296366f7833e47002edea55a9d7ac917c97 (patch)
tree2499f9391687b19b9135492cac7af18144d3f18a
parentf8fcc057d51bd320893b8c3311f1b460b1c297ce (diff)
downloadpoky-ab252296366f7833e47002edea55a9d7ac917c97.tar.gz
relocatable.bbclass: Avoid an exception if an empty pkgconfig dir exist
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: d449e6b536c197b6723dab1d61e989706c14f19c) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit f9c5df6dc1c13e9b05ff1b47ad84ad339f6779a4) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/relocatable.bbclass20
1 files changed, 11 insertions, 9 deletions
diff --git a/meta/classes/relocatable.bbclass b/meta/classes/relocatable.bbclass
index 582812c..af04be5 100644
--- a/meta/classes/relocatable.bbclass
+++ b/meta/classes/relocatable.bbclass
@@ -6,13 +6,15 @@ python relocatable_binaries_preprocess() {
6 rpath_replace(d.expand('${SYSROOT_DESTDIR}'), d) 6 rpath_replace(d.expand('${SYSROOT_DESTDIR}'), d)
7} 7}
8 8
9relocatable_native_pcfiles () { 9relocatable_native_pcfiles() {
10 if [ -d ${SYSROOT_DESTDIR}${libdir}/pkgconfig ]; then 10 for dir in ${libdir}/pkgconfig ${datadir}/pkgconfig; do
11 rel=${@os.path.relpath(d.getVar('base_prefix'), d.getVar('libdir') + "/pkgconfig")} 11 files_template=${SYSROOT_DESTDIR}$dir/*.pc
12 sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" ${SYSROOT_DESTDIR}${libdir}/pkgconfig/*.pc 12 # Expand to any files matching $files_template
13 fi 13 files=$(echo $files_template)
14 if [ -d ${SYSROOT_DESTDIR}${datadir}/pkgconfig ]; then 14 # $files_template and $files will differ if any files were found
15 rel=${@os.path.relpath(d.getVar('base_prefix'), d.getVar('datadir') + "/pkgconfig")} 15 if [ "$files_template" != "$files" ]; then
16 sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" ${SYSROOT_DESTDIR}${datadir}/pkgconfig/*.pc 16 rel=$(realpath -m --relative-to=$dir ${base_prefix})
17 fi 17 sed -i -e "s:${base_prefix}:\${pcfiledir}/$rel:g" $files
18 fi
19 done
18} 20}