diff mbox series

Revert "python3-pycairo: inherit python3-dir not python3targetconfig"

Message ID 20260901092430.915029-2-jose.quaresma@oss.qualcomm.com
State Under Review
Headers show
Series Revert "python3-pycairo: inherit python3-dir not python3targetconfig" | expand

Commit Message

Jose Quaresma Sept. 1, 2026, 9:24 a.m. UTC
This reverts commit 7aa548771b7d405e215219360bd60c1b6efe9069.

Without this the arch on the library name changes from "aarch64"
to "x86_64" when we build for arm64 target.

Analysis of buildhistory shows that the content is the same,
only the name changes:

# --- a/packages/armv8a-oe-linux/python3-pycairo/sysroot
# +++ b/packages/armv8a-oe-linux/python3-pycairo/sysroot
# @@ -9,8 +9,8 @@
#  drwxr-xr-x -          -                  22 ./usr/lib/pkgconfig
#  -rw-r--r-- -          -                 162 ./usr/lib/pkgconfig/py3cairo.pc
#  drwxr-xr-x -          -                  26 ./usr/lib/python3.14
#  drwxr-xr-x -          -                  58 ./usr/lib/python3.14/site-packages
# -drwxr-xr-x -          -                 174 ./usr/lib/python3.14/site-packages/cairo
# --rwxr-xr-x -          -              303544 ./usr/lib/python3.14/site-packages/cairo/_cairo.cpython-314-x86_64-linux-gnu.so
# +drwxr-xr-x -          -                 176 ./usr/lib/python3.14/site-packages/cairo
# +-rwxr-xr-x -          -              303544 ./usr/lib/python3.14/site-packages/cairo/_cairo.cpython-314-aarch64-linux-gnu.so
#  drwxr-xr-x -          -                  20 ./usr/lib/python3.14/site-packages/cairo/include
#  -rw-r--r-- -          -                8778 ./usr/lib/python3.14/site-packages/cairo/include/py3cairo.h
#  -rw-r--r-- -          -                 660 ./usr/lib/python3.14/site-packages/cairo/__init__.py

Signed-off-by: Jose Quaresma <jose.quaresma@oss.qualcomm.com>
---
 meta/recipes-devtools/python/python3-pycairo_1.29.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ross Burton Sept. 1, 2026, 2:38 p.m. UTC | #1
Verified this is the right fix. 

Thanks Jose.  My usual builds are arm-on-arm so I didn’t notice this problem.

Ross

> On 1 Sep 2026, at 10:24, Jose Quaresma via lists.openembedded.org <jose.quaresma=oss.qualcomm.com@lists.openembedded.org> wrote:
> 
> This reverts commit 7aa548771b7d405e215219360bd60c1b6efe9069.
> 
> Without this the arch on the library name changes from "aarch64"
> to "x86_64" when we build for arm64 target.
> 
> Analysis of buildhistory shows that the content is the same,
> only the name changes:
> 
> # --- a/packages/armv8a-oe-linux/python3-pycairo/sysroot
> # +++ b/packages/armv8a-oe-linux/python3-pycairo/sysroot
> # @@ -9,8 +9,8 @@
> #  drwxr-xr-x -          -                  22 ./usr/lib/pkgconfig
> #  -rw-r--r-- -          -                 162 ./usr/lib/pkgconfig/py3cairo.pc
> #  drwxr-xr-x -          -                  26 ./usr/lib/python3.14
> #  drwxr-xr-x -          -                  58 ./usr/lib/python3.14/site-packages
> # -drwxr-xr-x -          -                 174 ./usr/lib/python3.14/site-packages/cairo
> # --rwxr-xr-x -          -              303544 ./usr/lib/python3.14/site-packages/cairo/_cairo.cpython-314-x86_64-linux-gnu.so
> # +drwxr-xr-x -          -                 176 ./usr/lib/python3.14/site-packages/cairo
> # +-rwxr-xr-x -          -              303544 ./usr/lib/python3.14/site-packages/cairo/_cairo.cpython-314-aarch64-linux-gnu.so
> #  drwxr-xr-x -          -                  20 ./usr/lib/python3.14/site-packages/cairo/include
> #  -rw-r--r-- -          -                8778 ./usr/lib/python3.14/site-packages/cairo/include/py3cairo.h
> #  -rw-r--r-- -          -                 660 ./usr/lib/python3.14/site-packages/cairo/__init__.py
> 
> Signed-off-by: Jose Quaresma <jose.quaresma@oss.qualcomm.com>
> ---
> meta/recipes-devtools/python/python3-pycairo_1.29.1.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-devtools/python/python3-pycairo_1.29.1.bb b/meta/recipes-devtools/python/python3-pycairo_1.29.1.bb
> index 19e41baac4..b70d1f177d 100644
> --- a/meta/recipes-devtools/python/python3-pycairo_1.29.1.bb
> +++ b/meta/recipes-devtools/python/python3-pycairo_1.29.1.bb
> @@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "4fbd26b4af24c9787d84cf5448e34eb8dca064b732479aaecd03109520
> 
> S = "${UNPACKDIR}/pycairo-${PV}"
> 
> -inherit meson pkgconfig python3-dir github-releases
> +inherit meson pkgconfig python3targetconfig github-releases
> 
> CFLAGS += "-fPIC"
> 
> -- 
> 2.55.0
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#244813): https://lists.openembedded.org/g/openembedded-core/message/244813
> Mute This Topic: https://lists.openembedded.org/mt/121028960/6875888
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ross.burton@arm.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta/recipes-devtools/python/python3-pycairo_1.29.1.bb b/meta/recipes-devtools/python/python3-pycairo_1.29.1.bb
index 19e41baac4..b70d1f177d 100644
--- a/meta/recipes-devtools/python/python3-pycairo_1.29.1.bb
+++ b/meta/recipes-devtools/python/python3-pycairo_1.29.1.bb
@@ -17,7 +17,7 @@  SRC_URI[sha256sum] = "4fbd26b4af24c9787d84cf5448e34eb8dca064b732479aaecd03109520
 
 S = "${UNPACKDIR}/pycairo-${PV}"
 
-inherit meson pkgconfig python3-dir github-releases
+inherit meson pkgconfig python3targetconfig github-releases
 
 CFLAGS += "-fPIC"