mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-01-12 03:24:08 +00:00
lapack: fix buildpaths in ptest also when CBLAS is enabled
ERROR: lapack-3.12.0-r0 do_package_qa: QA Issue: File /usr/lib/lapack/ptest/bin/xccblat3 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xdcblat3 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xdcblat1 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xscblat1 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xccblat2 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xzcblat2 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xzcblat1 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xccblat1 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xdcblat2 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xscblat2 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xscblat3 in package lapack-ptest contains reference to TMPDIR File /usr/lib/lapack/ptest/bin/xzcblat3 in package lapack-ptest contains reference to TMPDIR [buildpaths] Signed-off-by: Martin Jansa <martin.jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
committed by
Armin Kuster
parent
bcb97fcfcb
commit
6851cbf026
@@ -35,7 +35,12 @@ inherit cmake pkgconfig ptest
|
||||
EXCLUDE_FROM_WORLD = "1"
|
||||
|
||||
# The `xerbla.o` file contains an absolute path in `xerbla.f.o`, but the options
|
||||
# `-fdebug-prefix-map` and `-ffile-prefix-map` cannot be used because gfortran does not support them.
|
||||
# `-fdebug-prefix-map` and `-ffile-prefix-map` cannot be used because gfortran does
|
||||
# not support them. And we cannot easily change CMake to use relative paths, because
|
||||
# it will convert them to absolute paths when generating Unix Makefiles or Ninja:
|
||||
# https://gitlab.kitware.com/cmake/community/-/wikis/FAQ#why-does-cmake-use-full-paths-or-can-i-copy-my-build-tree
|
||||
# https://gitlab.kitware.com/cmake/cmake/-/issues/13894
|
||||
#
|
||||
# To address this issue, we manually replace the absolute path with a relative path
|
||||
# in the generated `build.make` file.
|
||||
#
|
||||
@@ -46,7 +51,7 @@ EXCLUDE_FROM_WORLD = "1"
|
||||
# of `xerbla.f` to a relative path. The steps are as follows:
|
||||
#
|
||||
# 1. Locate all `build.make` files after the `do_configure` step is completed.
|
||||
# 2. Compute the relative path for `xerbla.f` based on the current build directory.
|
||||
# 2. Compute the relative path for various `*.f` files based on the current build directory.
|
||||
# 3. Replace the absolute path with the calculated relative path in the `build.make` files
|
||||
#
|
||||
# Additionally, when ptests are enabled, apply a simpler workaround for ptest code:
|
||||
@@ -54,11 +59,17 @@ EXCLUDE_FROM_WORLD = "1"
|
||||
# the MATGEN subdirectory, with a relative path prefix of `"../../.."`.
|
||||
do_configure:append(){
|
||||
for file in `find ${B} -name build.make`; do
|
||||
sed -i -e "s#\(.*-c \).*\(/xerbla\.f \)#\1$(grep '\-c .*xerbla\.f' $file | awk -F'cd ' '{print $2}'| \
|
||||
awk '{src=$1; sub(/.*-c /, ""); sub(/xerbla\.f.*/, ""); obj=$0; print src, obj}' | \
|
||||
while read src obj; do echo "$(realpath --relative-to="$src" "$obj")"; done)\2#g" $file
|
||||
# Replacing all .f files found with:
|
||||
# for f in $(find ${S} -name \*.f -printf " %f" | sort -u); do
|
||||
# would be more reliable with other optional PACKAGECONFIGs, but also very slow as there are
|
||||
# ~ 3500 of them and this loop takes around 20 minutes
|
||||
for f in xerbla c_cblat1 c_cblat2 c_cblat3 c_dblat1 c_dblat2 c_dblat3 c_sblat1 c_sblat2 c_sblat3 c_zblat1 c_zblat2 c_zblat3; do
|
||||
sed -i -e "s#\(.*-c \).*\(/$f\.f \)#\1$(grep "\-c .*$f\.f" $file | awk -F'cd ' '{print $2}'| \
|
||||
awk "{src=\$1; sub(/.*-c /, \"\"); sub(/$f\.f.*/, \"\"); obj=\$0; print src, obj}" | \
|
||||
while read src obj; do echo "$(realpath --relative-to="$src" "$obj")"; done)\2#g" $file
|
||||
done
|
||||
done
|
||||
if (${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)});then
|
||||
if ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)} ; then
|
||||
for file in `find . -name build.make -path '*TESTING*' -not -path '*MATGEN*'`; do
|
||||
sed -i -e "s#\(.*-c \)\(${WORKDIR}\)\(.*.[f|F] \)#\1../../..\3#g" $file
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user