Skip to contentSkip to conversation

lapack: fix TMPDIR reference in do_package_qa

PATCH New Martin Jansa 1 participant 3 messages Jan 27, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 lapack: fix TMPDIR reference in do_package_qa

From: Zhang Peng <[email protected]>

When building the lapack package, the following QA error occurs:
"File /usr/lib64/libblas.so.3.12.0 in package lapack contains reference to TMPDIR [buildpaths]"

The issue arises because the xerbla.o object file embeds the absolute host path of xerbla.f. This occurs during compilation, where the build command in build.make (generated by CMake) specifies:
gfortran -c <absolute path>/xerbla.f -o.

As a result, the absolute path is included in xerbla.o. Unfortunately, gfortran does not support flags like -fdebug-prefix-map or -ffile-prefix-map to remove such paths.

To resolve this, the fix involves replacing the absolute path of xerbla.f in the generated build.make file with a relative path before the compilation step. This ensures that the resulting xerbla.o does not contain any references to TMPDIR, passing the do_package_qa check.

For ptest code, the solution is to replace ${WORKDIR} with ../../.. in the generated build.make files located in the TESTING directory.

---
 .../recipes-devtools/lapack/lapack_3.12.0.bb  | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb +31 -0
index fef9d3a80e..4357515b71 100644
@@ -33,6 +33,37 @@ OECMAKE_GENERATOR = "Unix Makefiles"
 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.
+# To address this issue, we manually replace the absolute path with a relative path
+# in the generated `build.make` file.
+#
+# An issue has been reported: https://github.com/Reference-LAPACK/lapack/issues/1087,
+# requesting a fix in the source code.
+#
+# This workaround resolves the TMPDIR [buildpaths] issue by converting the absolute path
+# 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.
+# 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:
+# - Replace occurrences of `${WORKDIR}` in all `build.make` files under the TESTING directory, excluding
+#   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
+    done
+    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
+    fi
+}
+
 do_install_ptest () {
     rsync -a ${B}/TESTING ${D}${PTEST_PATH} \
           --exclude CMakeFiles \
Signature · 1 line
2.48.1
#1 lore raw

PATCH 2/3 lapack: add PACKAGECONFIG for cblas

---
 meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb | 1 +
 1 file changed, 1 insertion(+)
meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb +1 -0
index 4357515b71..aafcdef681 100644
@@ -24,6 +24,7 @@ S = "${WORKDIR}/git"
 
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[lapacke] = "-DLAPACKE=ON,-DLAPACKE=OFF"
+PACKAGECONFIG[cblas] = "-DCBLAS=ON,-DCBLAS=OFF"
 
 EXTRA_OECMAKE = " -DBUILD_SHARED_LIBS=ON \
                   ${@bb.utils.contains('PTEST_ENABLED', '1', ' -DBUILD_TESTING=ON', '', d)} \
Signature · 1 line
2.48.1
#2 lore raw

PATCH 3/3 lapack: fix buildpaths in ptest also when CBLAS is enabled

In reply to Martin Jansa

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]

---
 .../recipes-devtools/lapack/lapack_3.12.0.bb  | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)
meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb +17 -6
index aafcdef681..4845d34106 100644
@@ -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
Signature · 1 line
2.48.1