diff options
| author | Trevor Gamblin <tgamblin@baylibre.com> | 2024-11-27 16:26:56 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-11-28 00:07:30 +0000 |
| commit | 0b6250641129a86d1200e3a1965d57c9b8c9e441 (patch) | |
| tree | e0698e51bc361b60557c43697e33b9f4a427be36 /meta | |
| parent | eae43f42b78b50eeab59310e1f6388dcf04645d9 (diff) | |
| download | poky-0b6250641129a86d1200e3a1965d57c9b8c9e441.tar.gz | |
python3-numpy: inherit pkgconfig
This was supposed to be added in oe-core commit fd656aaf7fbe
("python3-numpy: upgrade 1.26.4 -> 2.1.3"), but it somehow got missed in
the final version of that patch. Add it now to fix possible do_compile
errors on some systems, due to host paths sneaking into the meson build
options, e.g.:
| Build machine cpu family: x86_64
| Build machine cpu: x86_64
| Host machine cpu family: x86_64
| Host machine cpu: x86_64
| Target machine cpu family: x86_64
| Target machine cpu: x86_64
| Program python3 found: YES (/home/tgamblin/workspace/yocto/poky/build/tmp/work/core2-64-poky-linux-musl/python3-numpy/2.1.3/recipe-sysroot-native/usr/bin/nativepython3)
| Did not find pkg-config by name 'pkg-config'
| Found pkg-config: NO
| Run-time dependency python found: NO (tried pkgconfig, pkgconfig and sysconfig)
|
| ../numpy-2.1.3/meson.build:41:12: ERROR: Python dependency not found
|
| A full log can be found at /home/tgamblin/workspace/yocto/poky/build/tmp/work/core2-64-poky-linux-musl/python3-numpy/2.1.3/build/meson-logs/meson-log.txt
and notably (meson-log.txt snippet):
|x86_64-poky-linux-musl-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/media/build/poky/build/tmp/work/core2-64-poky-linux-musl/python3-numpy/2.1.3/recipe-sysroot -I/media/build/poky/build/tmp/work/core2-64-poky-linux-musl/python3-numpy/2.1.3/recipe-sysroot/usr/include/python3.13 -I/usr/include/python3.13
A bug has been filed about this and the related gcc issue: https://bugzilla.yoctoproject.org/show_bug.cgi?id=15672
With pkgconfig on the inherit line, all include directives in
meson-log.txt end up looking something like:
|-I/home/tgamblin/workspace/yocto/poky/build/tmp/work/core2-64-poky-linux-musl/python3-numpy/2.1.3/recipe-sysroot/usr/include/python3.13
(From OE-Core rev: b8503a2c5000262a400375321de75161357111fb)
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/python/python3-numpy_2.1.3.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python3-numpy_2.1.3.bb b/meta/recipes-devtools/python/python3-numpy_2.1.3.bb index da75dff1e0..0120bee439 100644 --- a/meta/recipes-devtools/python/python3-numpy_2.1.3.bb +++ b/meta/recipes-devtools/python/python3-numpy_2.1.3.bb | |||
| @@ -18,7 +18,7 @@ SRC_URI[sha256sum] = "aa08e04e08aaf974d4458def539dece0d28146d866a39da5639596f492 | |||
| 18 | GITHUB_BASE_URI = "https://github.com/numpy/numpy/releases" | 18 | GITHUB_BASE_URI = "https://github.com/numpy/numpy/releases" |
| 19 | UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$" | 19 | UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$" |
| 20 | 20 | ||
| 21 | inherit ptest python_mesonpy github-releases cython | 21 | inherit pkgconfig ptest python_mesonpy github-releases cython |
| 22 | 22 | ||
| 23 | S = "${WORKDIR}/numpy-${PV}" | 23 | S = "${WORKDIR}/numpy-${PV}" |
| 24 | 24 | ||