meson: 0.60.3 -> 0.61.2 #154833

NickCao · 2022-01-13T02:01:56Z

Motivation for this change

Things done

bobby285271 · 2022-01-13T02:56:39Z

~~Bumping meson to 0.61.0 will break most Pantheon packages without proper patching (mostly fails with "Function does not take positional arguments").~~ I opened #154837 (merged).

EDIT: Not trying to block this, but I am not sure if GNOME is also ready for this: #162938 #160128 #160126 #160283 #161241, though it should be quite trivial to fix similar issues.

NickCao · 2022-01-13T02:57:56Z

I also noticed some regression when building glib natively, namely mesonbuild/meson#9807, that didn't make it the 0.60.0.

jtojnar · 2022-01-13T03:04:55Z

Reading the discussion in #144779 (comment), I thought we cherry-picked the patch. But perhaps it got forgotten in the mess caused by splitting the package.

jtojnar · 2022-01-13T03:06:29Z

Yeah, it is in the original PR: https://github.com/NixOS/nixpkgs/pull/144779/files#diff-f4a18ab9c966d0274b79b396e0f506406ee5fb7d60758f71bc3de9662db8d455

NickCao · 2022-01-13T04:56:47Z

gobject-introspection is also broken: https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/effb1e09dee263cdac4ec593e8caf316e6f01fe2

NickCao · 2022-01-14T01:32:35Z

harfbuzz breaks when cross building docs:

harfbuzz-riscv64-unknown-linux-gnu>     t_args.append('--run=' + ' '.join(state.environment.get_exe_wrapper().get_command()))
harfbuzz-riscv64-unknown-linux-gnu> AttributeError: 'NoneType' object has no attribute 'get_command'
harfbuzz-riscv64-unknown-linux-gnu> docs/meson.build:50:6: ERROR: Unhandled python exception
harfbuzz-riscv64-unknown-linux-gnu>     This is a Meson bug and should be reported!

can be worked around by disabling docs when crossing.

This seems to be a meson bug in handling exe wrappers,strangely the related codes are not modified recently.

NickCao · 2022-01-14T03:02:12Z

applied multiple patches following archlinux, ref: https://github.com/archlinux/svntogit-packages/blob/31d9974f1c4d3badca5809d74bc8c5e8379e3ee3/trunk/PKGBUILD

Mindavi · 2022-01-14T07:04:19Z

Yeah, either this or at least adding the cross-compilation patch would be nice. Adding the patch is probably 'safer' for now, but I don't know what the breakage for the meson bump actually is. Reading this thread it might be painful regardless of what we choose.

alyssais · 2022-01-14T13:42:06Z

Yeah, I think we should just apply the patch like the original PR did to unblock staging next, and then retarget this to staging where there's a bit less time pressure.

NickCao · 2022-01-15T00:31:28Z

meson 0.60 is actually as broken as 0.61, and there are already enough upstream fixes to apply at least for the critical packages. I'm more in favour of skipping 0.60.

jtojnar · 2022-01-15T02:09:42Z

Not sure what you mean. Both glib and gobject-introspection seem to build in native compilation with 0.60.

NickCao · 2022-01-15T03:41:33Z

Not sure what you mean. Both glib and gobject-introspection seem to build in native compilation with 0.60.

My mistake, you are correct, let's just do as @alyssais said, bring back the lost patch and retarget this one.

NickCao · 2022-01-26T00:52:26Z

is this in a reviewable state?

yes, still have to tackle with a bunch of build failures in the next staging-next cycle though, but meson itself should be good as is.

jtojnar · 2022-01-26T09:03:10Z

polkit https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/105

alyssais · 2022-03-06T11:45:00Z

@jtojnar @AndersonTorres are you happy with this? The next meson release is scheduled for tomorrow, so would be great if we could get this in so we don't have to upgrade through multiple versions at once again.

NickCao · 2022-03-07T08:25:45Z

Why not just wait for another day? Skipping a meson release looks like a benefit for us.

AndersonTorres · 2022-03-07T12:59:25Z

If the next Meson is not a 0.62.x, then wait until tomorrow.

NickCao · 2022-03-12T02:16:07Z

The newly tagged meson 0.62.0rc1 breaks glib even in native compilation, let's get this in staging and wait for the new meson release to brew.

AndersonTorres · 2022-03-12T11:51:30Z

RC release?
Breaking even the easiest case?

Oh man...

jtojnar · 2022-03-12T14:22:25Z

polkit is still broken:

actions/meson.build:3:5: ERROR: Function does not take positional arguments.

Needs: https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/99

AndersonTorres · 2022-03-14T13:09:48Z

Why is Darwin failing?

NickCao · 2022-03-14T13:12:05Z

Why is Darwin failing?

Looks like dependency failures?

vcunat · 2022-03-14T13:41:33Z

OfBorg build attempts are usually not much use when filing PRs against staging (or any branch without many binaries).

AndersonTorres · 2022-03-14T19:25:26Z

That being said, I will merge this.

trofi · 2022-03-16T08:21:19Z

meld and gcr are also affected:

error: builder for '/nix/store/c10z65p2xbbawp2rkf4ckldkxw2vhb27-meld-3.21.1.drv' failed with exit code 1;
       last 10 log lines:
       > Configuring conf.py using configuration
       > Found pkg-config: /nix/store/hmqp1izgl9w66hi498g2yra9blxgkahi-pkg-config-wrapper-0.29.2/bin/pkg-config (0.29.2)
       > Program glib-compile-resources found: YES (/nix/store/s9y11yw1m3ymi29phfzgj589dgnqyn1r-glib-2.70.3-dev/bin/glib-compile-resources)
       > Configuring org.gnome.Meld.desktop.in using configuration
       > Program desktop-file-validate found: YES (/nix/store/ihlxnklqbi2c9862z1vq3rr7ay9i5gxx-desktop-file-utils-0.26/bin/desktop-file-validate)
       > Configuring org.gnome.meld.appdata.xml.in using configuration
       >
       > data/meson.build:34:0: ERROR: Function does not take positional arguments.
       >
       > A full log can be found at /build/meld-3.21.1/build/meson-logs/meson-log.txt
       For full logs, run 'nix log /nix/store/c10z65p2xbbawp2rkf4ckldkxw2vhb27-meld-3.21.1.drv'.

error: builder for '/nix/store/3zfnzk2xlq1nj62h80rks6m8vc7g4x40-gcr-3.41.0.drv' failed with exit code 1;
       last 10 log lines:
       > Configuring gck-version.h using configuration
       > Program glib-mkenums found: YES (/nix/store/s9y11yw1m3ymi29phfzgj589dgnqyn1r-glib-2.70.3-dev/bin/glib-mkenums)
       > Program glib-mkenums found: YES (/nix/store/s9y11yw1m3ymi29phfzgj589dgnqyn1r-glib-2.70.3-dev/bin/glib-mkenums)
       > Found pkg-config: /nix/store/hmqp1izgl9w66hi498g2yra9blxgkahi-pkg-config-wrapper-0.29.2/bin/pkg-config (0.29.2)
       > Program glib-genmarshal found: YES (/nix/store/s9y11yw1m3ymi29phfzgj589dgnqyn1r-glib-2.70.3-dev/bin/glib-genmarshal)
       > Compiler for C supports link arguments -Wl,--version-script,/build/gcr-3.41.0/gck/libgck.map: YES
       >
       > gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages"
       >
       > A full log can be found at /build/gcr-3.41.0/build/meson-logs/meson-log.txt
       For full logs, run 'nix log /nix/store/3zfnzk2xlq1nj62h80rks6m8vc7g4x40-gcr-3.41.0.drv'.

bobby285271 · 2022-03-16T08:27:43Z

Maybe we will need this patch for gcr.

For Function does not take positional arguments. we are thinking of patching meson with mesonbuild/meson@022c035, some discussion happens in #164266.

NickCao · 2022-03-16T09:24:25Z

When would the next staging-next cycle begin? I would like to take a look at the blast radius before determining whether it's appropriate to patch meson (again). FYI, meson 0.61.3 was just released 2 days ago, nothing interesting though, jut a reminder.

vcunat · 2022-03-16T09:52:28Z

It should be as soon as Hydra recovers from the openssl update. EDIT: around this weekend, I expect.

trofi · 2022-03-20T08:46:17Z

Proposed gcr fix as #164945

trofi · 2022-03-20T08:59:53Z

Proposed meld fix as #164948

Mindavi · 2022-04-14T06:10:49Z

Harfbuzz cross-compilation seems to have broken in this update, might investigate later.

Program gtkdoc-fixxref found: YES (/nix/store/yglq5bwhn1j3qpgv06hv4nbvgjinwik4-gtk-doc-1.33.2/bin/gtkdoc-fixxref)
Traceback (most recent call last):
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/mesonmain.py", line 146, in run
    return options.run_func(options)
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/msetup.py", line 294, in run
    app.generate()
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/msetup.py", line 185, in generate
    self._generate(env)
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/msetup.py", line 229, in _generate
    intr.run()
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/interpreter/interpreter.py", line 2549, in run
    super().run()
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/interpreterbase/interpreterbase.py", line 148, in run
    self.evaluate_codeblock(self.ast, start=1)
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/interpreterbase/interpreterbase.py", line 173, in evaluate_codeblock
    raise e
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/interpreterbase/interpreterbase.py", line 166, in evaluate_codeblock
    self.evaluate_statement(cur)
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/interpreterbase/interpreterbase.py", line 189, in evaluate_statement
    return self.evaluate_if(cur)
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/interpreterbase/interpreterbase.py", line 272, in evaluate_if
    self.evaluate_codeblock(i.block)
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/interpreterbase/interpreterbase.py", line 173, in evaluate_codeblock
    raise e
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/interpreterbase/interpreterbase.py", line 166, in evaluate_codeblock
    self.evaluate_statement(cur)
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/interpreterbase/interpreterbase.py", line 179, in evaluate_statement
    return self.function_call(cur)
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/interpreterbase/interpreterbase.py", line 454, in function_call
    res = func(node, func_args, kwargs)
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/interpreterbase/decorators.py", line 276, in wrapper
    return f(*nargs, **wrapped_kwargs)
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/interpreterbase/decorators.py", line 573, in wrapper
    return f(*wrapped_args, **wrapped_kwargs)
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/interpreter/interpreter.py", line 2039, in func_subdir
    self.evaluate_codeblock(codeblock)
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/interpreterbase/interpreterbase.py", line 173, in evaluate_codeblock
    raise e
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/interpreterbase/interpreterbase.py", line 166, in evaluate_codeblock
    self.evaluate_statement(cur)
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/interpreterbase/interpreterbase.py", line 183, in evaluate_statement
    return self.method_call(cur)
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/interpreterbase/interpreterbase.py", line 482, in method_call
    res = obj.method_call(method_name, args, kwargs)
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/interpreter/interpreterobjects.py", line 761, in method_call
    ret = method(state, args, kwargs)
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/interpreterbase/decorators.py", line 276, in wrapper
    return f(*nargs, **wrapped_kwargs)
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/interpreterbase/decorators.py", line 573, in wrapper
    return f(*wrapped_args, **wrapped_kwargs)
  File "/nix/store/54pqyk0ni1c1z6ywiba4vf30pa1q8rr8-meson-0.61.2/lib/python3.9/site-packages/mesonbuild/modules/gnome.py", line 1365, in gtkdoc
    t_args.append('--run=' + ' '.join(state.environment.get_exe_wrapper().get_command()))
AttributeError: 'NoneType' object has no attribute 'get_command'

docs/meson.build:50:6: ERROR: Unhandled python exception

    This is a Meson bug and should be reported!

Probably an upstream bug.

Edit: reverting meson works, so definitely feels like an upstream meson bug.
Edit 2: fixed by mesonbuild/meson#9841

veprbl changed the title ~~meson: 0.60.3 -> 0.61.0~~ [staging-next] meson: 0.60.3 -> 0.61.0 Jan 13, 2022

ofborg bot requested review from AndersonTorres and jtojnar January 13, 2022 02:54

ofborg bot added 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ labels Jan 13, 2022

NickCao marked this pull request as draft January 13, 2022 02:58

NickCao force-pushed the meson branch from 5e308f0 to 3d077bc Compare January 14, 2022 03:01

NickCao mentioned this pull request Jan 14, 2022

gobject-introspection: prepare for meson 0.61 #154979

Merged

13 tasks

NickCao force-pushed the meson branch from 3d077bc to 80b701c Compare January 15, 2022 03:42

NickCao changed the base branch from staging-next to staging January 15, 2022 03:43

NickCao changed the title ~~[staging-next] meson: 0.60.3 -> 0.61.0~~ meson: 0.60.3 -> 0.61.0 Jan 15, 2022

NickCao marked this pull request as ready for review January 15, 2022 03:43

NickCao mentioned this pull request Jan 15, 2022

[staging-next] meson: do not update ldconfig cache #155067

Merged

13 tasks

ofborg bot requested a review from jtojnar January 26, 2022 02:04

NickCao force-pushed the meson branch from adc326c to b0a0936 Compare February 18, 2022 15:21

NickCao changed the title ~~meson: 0.60.3 -> 0.61.1~~ meson: 0.60.3 -> 0.61.2 Feb 18, 2022

AndersonTorres approved these changes Mar 12, 2022

View reviewed changes

meson: 0.60.3 -> 0.61.2

b5fde72

NickCao force-pushed the meson branch from b0a0936 to b5fde72 Compare March 13, 2022 04:10

NickCao mentioned this pull request Mar 13, 2022

polkit: fix build with meson 0.61 #163956

Merged

13 tasks

ofborg bot requested a review from AndersonTorres March 13, 2022 04:55

AndersonTorres merged commit 40affce into NixOS:staging Mar 14, 2022

NickCao deleted the meson branch March 15, 2022 00:04

NickCao mentioned this pull request Mar 16, 2022

meson: patch for not hard failing on positional arguments passed to i… #164400

Closed

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

meson: 0.60.3 -> 0.61.2 #154833

meson: 0.60.3 -> 0.61.2 #154833

NickCao commented Jan 13, 2022

bobby285271 commented Jan 13, 2022 •

edited

Loading

NickCao commented Jan 13, 2022

jtojnar commented Jan 13, 2022

jtojnar commented Jan 13, 2022

NickCao commented Jan 13, 2022

NickCao commented Jan 14, 2022 •

edited

Loading

NickCao commented Jan 14, 2022

Mindavi commented Jan 14, 2022

alyssais commented Jan 14, 2022

NickCao commented Jan 15, 2022 •

edited

Loading

jtojnar commented Jan 15, 2022

NickCao commented Jan 15, 2022

NickCao commented Jan 26, 2022

jtojnar commented Jan 26, 2022

alyssais commented Mar 6, 2022

NickCao commented Mar 7, 2022

AndersonTorres commented Mar 7, 2022

NickCao commented Mar 12, 2022

AndersonTorres commented Mar 12, 2022

jtojnar commented Mar 12, 2022 •

edited

Loading

AndersonTorres commented Mar 14, 2022

NickCao commented Mar 14, 2022

vcunat commented Mar 14, 2022

AndersonTorres commented Mar 14, 2022

trofi commented Mar 16, 2022

bobby285271 commented Mar 16, 2022

NickCao commented Mar 16, 2022

vcunat commented Mar 16, 2022 •

edited

Loading

trofi commented Mar 20, 2022

trofi commented Mar 20, 2022

Mindavi commented Apr 14, 2022 •

edited

Loading

meson: 0.60.3 -> 0.61.2 #154833

meson: 0.60.3 -> 0.61.2 #154833

Conversation

NickCao commented Jan 13, 2022

Motivation for this change

Things done

bobby285271 commented Jan 13, 2022 • edited Loading

NickCao commented Jan 13, 2022

jtojnar commented Jan 13, 2022

jtojnar commented Jan 13, 2022

NickCao commented Jan 13, 2022

NickCao commented Jan 14, 2022 • edited Loading

NickCao commented Jan 14, 2022

Mindavi commented Jan 14, 2022

alyssais commented Jan 14, 2022

NickCao commented Jan 15, 2022 • edited Loading

jtojnar commented Jan 15, 2022

NickCao commented Jan 15, 2022

NickCao commented Jan 26, 2022

jtojnar commented Jan 26, 2022

alyssais commented Mar 6, 2022

NickCao commented Mar 7, 2022

AndersonTorres commented Mar 7, 2022

NickCao commented Mar 12, 2022

AndersonTorres commented Mar 12, 2022

jtojnar commented Mar 12, 2022 • edited Loading

AndersonTorres commented Mar 14, 2022

NickCao commented Mar 14, 2022

vcunat commented Mar 14, 2022

AndersonTorres commented Mar 14, 2022

trofi commented Mar 16, 2022

bobby285271 commented Mar 16, 2022

NickCao commented Mar 16, 2022

vcunat commented Mar 16, 2022 • edited Loading

trofi commented Mar 20, 2022

trofi commented Mar 20, 2022

Mindavi commented Apr 14, 2022 • edited Loading

bobby285271 commented Jan 13, 2022 •

edited

Loading

NickCao commented Jan 14, 2022 •

edited

Loading

NickCao commented Jan 15, 2022 •

edited

Loading

jtojnar commented Mar 12, 2022 •

edited

Loading

vcunat commented Mar 16, 2022 •

edited

Loading

Mindavi commented Apr 14, 2022 •

edited

Loading