mbox series

[0/3] swig: update from 4.2.1 to 4.3.0

Message ID 20241205093237.333818-1-mikko.rapeli@linaro.org
Headers show
Series swig: update from 4.2.1 to 4.3.0 | expand

Message

Mikko Rapeli Dec. 5, 2024, 9:32 a.m. UTC
Ran into some issues with swig generated code and python 3.13
and prepared these but then the issues turned out to be something else.
Sending these out anyway but there may be something missing
and/or broken.

Compiled obvious swig users:

$ bitbake dtc swig-native u-boot libdnf python3-dtc lttng-tools gpgme libcap-ng-python

Mikko Rapeli (3):
  swig: update from 4.2.1 to 4.3.0
  python3-dtc: update from 1.7.0 to 1.7.2
  dtc: update from 1.7.0 to 1.7.2

 ...erlay-make-overlay_get_target-public.patch | 132 ------------------
 ...hon3-dtc_1.7.0.bb => python3-dtc_1.7.2.bb} |   5 +-
 .../swig/swig/determinism.patch               |   8 +-
 .../swig/{swig_4.2.1.bb => swig_4.3.0.bb}     |   6 +-
 ...01-meson.build-bump-version-to-1.7.0.patch |  29 ----
 ...n-allow-building-from-shallow-clones.patch |  38 -----
 .../dtc/{dtc_1.7.0.bb => dtc_1.7.2.bb}        |   4 +-
 7 files changed, 10 insertions(+), 212 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch
 rename meta/recipes-devtools/python/{python3-dtc_1.7.0.bb => python3-dtc_1.7.2.bb} (84%)
 rename meta/recipes-devtools/swig/{swig_4.2.1.bb => swig_4.3.0.bb} (87%)
 delete mode 100644 meta/recipes-kernel/dtc/dtc/0001-meson.build-bump-version-to-1.7.0.patch
 delete mode 100644 meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch
 rename meta/recipes-kernel/dtc/{dtc_1.7.0.bb => dtc_1.7.2.bb} (86%)

Comments

Martin Jansa Dec. 5, 2024, 9:43 a.m. UTC | #1
Does this swig upgrade fix the issue with work around added in:
https://git.openembedded.org/meta-openembedded/commit/?id=f9158ce32fffa6f18eed4008c3295146c81d55ea
if yes, can you please send revert of this work around to meta-oe?

On Thu, Dec 5, 2024 at 10:33 AM Mikko Rapeli via
lists.openembedded.org
<mikko.rapeli=linaro.org@lists.openembedded.org> wrote:
>
> Ran into some issues with swig generated code and python 3.13
> and prepared these but then the issues turned out to be something else.
> Sending these out anyway but there may be something missing
> and/or broken.
>
> Compiled obvious swig users:
>
> $ bitbake dtc swig-native u-boot libdnf python3-dtc lttng-tools gpgme libcap-ng-python
>
> Mikko Rapeli (3):
>   swig: update from 4.2.1 to 4.3.0
>   python3-dtc: update from 1.7.0 to 1.7.2
>   dtc: update from 1.7.0 to 1.7.2
>
>  ...erlay-make-overlay_get_target-public.patch | 132 ------------------
>  ...hon3-dtc_1.7.0.bb => python3-dtc_1.7.2.bb} |   5 +-
>  .../swig/swig/determinism.patch               |   8 +-
>  .../swig/{swig_4.2.1.bb => swig_4.3.0.bb}     |   6 +-
>  ...01-meson.build-bump-version-to-1.7.0.patch |  29 ----
>  ...n-allow-building-from-shallow-clones.patch |  38 -----
>  .../dtc/{dtc_1.7.0.bb => dtc_1.7.2.bb}        |   4 +-
>  7 files changed, 10 insertions(+), 212 deletions(-)
>  delete mode 100644 meta/recipes-devtools/python/python3-dtc/0001-Revert-libfdt-overlay-make-overlay_get_target-public.patch
>  rename meta/recipes-devtools/python/{python3-dtc_1.7.0.bb => python3-dtc_1.7.2.bb} (84%)
>  rename meta/recipes-devtools/swig/{swig_4.2.1.bb => swig_4.3.0.bb} (87%)
>  delete mode 100644 meta/recipes-kernel/dtc/dtc/0001-meson.build-bump-version-to-1.7.0.patch
>  delete mode 100644 meta/recipes-kernel/dtc/dtc/0002-meson-allow-building-from-shallow-clones.patch
>  rename meta/recipes-kernel/dtc/{dtc_1.7.0.bb => dtc_1.7.2.bb} (86%)
>
> --
> 2.43.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#208366): https://lists.openembedded.org/g/openembedded-core/message/208366
> Mute This Topic: https://lists.openembedded.org/mt/109936275/3617156
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [martin.jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Mikko Rapeli Dec. 5, 2024, 10:11 a.m. UTC | #2
Hi,

On Thu, Dec 05, 2024 at 10:43:19AM +0100, Martin Jansa wrote:
> Does this swig upgrade fix the issue with work around added in:
> https://git.openembedded.org/meta-openembedded/commit/?id=f9158ce32fffa6f18eed4008c3295146c81d55ea
> if yes, can you please send revert of this work around to meta-oe?

Unfortunately no. Without f9158ce32fffa6f18eed4008c3295146 in meta-openembedded
python3-m2crypto fails:

| src/SWIG/_m2crypto_wrap.c: In function '_wrap_fd_set___fds_bits_set':
| src/SWIG/_m2crypto_wrap.c:11826:88: error: 'fd_set' has no member named '__fds_bits'; did you mean 'fds_bits'?
| 11826 |       for (; ii < (size_t)1024/(8*(int) sizeof(__fd_mask)); ++ii) *(__fd_mask *)&arg1->__fds_bits[ii] = *((__fd_mask
 *)arg2 + ii);
|       |                                                                                        ^~~~~~~~~~
|       |                                                                                        fds_bits
| src/SWIG/_m2crypto_wrap.c: In function '_wrap_fd_set___fds_bits_get':
| src/SWIG/_m2crypto_wrap.c:11851:48: error: 'fd_set' has no member named '__fds_bits'; did you mean 'fds_bits'?
| 11851 |   result = (__fd_mask *)(__fd_mask *) ((arg1)->__fds_bits);
|       |                                                ^~~~~~~~~~
|       |                                                fds_bits

With workaround f9158ce32fffa6f18eed4008c3295146c build passes.

Cheers,

-Mikko
Martin Jansa Dec. 5, 2024, 10:39 a.m. UTC | #3
On Thu, Dec 5, 2024 at 11:11 AM Mikko Rapeli <mikko.rapeli@linaro.org> wrote:
>
> Hi,
>
> On Thu, Dec 05, 2024 at 10:43:19AM +0100, Martin Jansa wrote:
> > Does this swig upgrade fix the issue with work around added in:
> > https://git.openembedded.org/meta-openembedded/commit/?id=f9158ce32fffa6f18eed4008c3295146c81d55ea
> > if yes, can you please send revert of this work around to meta-oe?
>
> Unfortunately no. Without f9158ce32fffa6f18eed4008c3295146 in meta-openembedded
> python3-m2crypto fails:
>
> | src/SWIG/_m2crypto_wrap.c: In function '_wrap_fd_set___fds_bits_set':
> | src/SWIG/_m2crypto_wrap.c:11826:88: error: 'fd_set' has no member named '__fds_bits'; did you mean 'fds_bits'?
> | 11826 |       for (; ii < (size_t)1024/(8*(int) sizeof(__fd_mask)); ++ii) *(__fd_mask *)&arg1->__fds_bits[ii] = *((__fd_mask
>  *)arg2 + ii);
> |       |                                                                                        ^~~~~~~~~~
> |       |                                                                                        fds_bits
> | src/SWIG/_m2crypto_wrap.c: In function '_wrap_fd_set___fds_bits_get':
> | src/SWIG/_m2crypto_wrap.c:11851:48: error: 'fd_set' has no member named '__fds_bits'; did you mean 'fds_bits'?
> | 11851 |   result = (__fd_mask *)(__fd_mask *) ((arg1)->__fds_bits);
> |       |                                                ^~~~~~~~~~
> |       |                                                fds_bits
>
> With workaround f9158ce32fffa6f18eed4008c3295146c build passes.

Thank you for checking.
Mikko Rapeli Dec. 5, 2024, 3:07 p.m. UTC | #4
Hi,

These changes are already in master-next from Alexander Kanavin <alex@linutronix.de>.
Sorry about the noise. I should check email archives and master-next before working
with updates or bug fixes. Maybe even check bugzilla too :)

Cheers,

-Mikko
Alexander Kanavin Dec. 5, 2024, 3:13 p.m. UTC | #5
It would still help to rebase your patches on top of mine. Sometimes
those duplicate commits contain additional useful tweaks that would
otherwise be lost.

Alex

On Thu, 5 Dec 2024 at 16:08, Mikko Rapeli via lists.openembedded.org
<mikko.rapeli=linaro.org@lists.openembedded.org> wrote:
>
> Hi,
>
> These changes are already in master-next from Alexander Kanavin <alex@linutronix.de>.
> Sorry about the noise. I should check email archives and master-next before working
> with updates or bug fixes. Maybe even check bugzilla too :)
>
> Cheers,
>
> -Mikko
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#208382): https://lists.openembedded.org/g/openembedded-core/message/208382
> Mute This Topic: https://lists.openembedded.org/mt/109936275/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Mikko Rapeli Dec. 5, 2024, 3:20 p.m. UTC | #6
Hi,

On Thu, Dec 05, 2024 at 04:13:39PM +0100, Alexander Kanavin wrote:
> It would still help to rebase your patches on top of mine. Sometimes
> those duplicate commits contain additional useful tweaks that would
> otherwise be lost.

I checked the details, commits are the same :)

Cheers,

-Mikko