From f52a1b8aeb9aca93f863ee7895127e144e48cec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 9 Dec 2016 15:24:04 +0100 Subject: [PATCH] cmake_auto_align_paths.bbclass: rework MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * search the whole build directorty * change files in ${base_libdir} too Changes became necessary by update of systemd to 232 (libudev.so -> /lib)and should be compatible to elder envioronments (e.g morty). Signed-off-by: Andreas Müller --- classes/cmake_auto_align_paths.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/classes/cmake_auto_align_paths.bbclass b/classes/cmake_auto_align_paths.bbclass index 8fe34b88..c8d311cc 100644 --- a/classes/cmake_auto_align_paths.bbclass +++ b/classes/cmake_auto_align_paths.bbclass @@ -1,10 +1,14 @@ +CMAKE_ALIGN_FILES_FIND ??= "*Targets.cmake" + do_configure_append() { # remove absolute paths from exported cmake files - for f in `find ${B}/CMakeFiles/Export -name '*.cmake'` ${CMAKE_ADD_ALIGN_FILES} ; do + for f in `find ${B} -name '${CMAKE_ALIGN_FILES_FIND}'` ${CMAKE_ADD_ALIGN_FILES} ; do sed -i 's:${STAGING_INCDIR_NATIVE}:${includedir}:g' "$f" sed -i 's:${STAGING_INCDIR}:${includedir}:g' "$f" sed -i 's:${STAGING_LIBDIR_NATIVE}:${libdir}:g' "$f" sed -i 's:${STAGING_LIBDIR}:${libdir}:g' "$f" + sed -i 's:${STAGING_BASELIBDIR_NATIVE}:${base_libdir}:g' "$f" + sed -i 's:${STAGING_BASELIBDIR}:${base_libdir}:g' "$f" done }