Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meson: 0.49.1 → 0.50.1 #57767

Merged
merged 1 commit into from
Jun 19, 2019
Merged

meson: 0.49.1 → 0.50.1 #57767

merged 1 commit into from
Jun 19, 2019

Conversation

jtojnar
Copy link
Member

@jtojnar jtojnar commented Mar 16, 2019

Motivation for this change

http://mesonbuild.com/Release-notes-for-0-50-0.html

needed for gnome-builder #57027

Built packages
  • ✔️ json-glib
  • ✔️ fwupd
  • ✔️ python3.pkgs.pycairo
  • ✔️ gnome3.gnome-shell
  • ✔️ sway
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@jtojnar jtojnar requested review from hedning and dtzWill March 16, 2019 19:59
@hedning
Copy link
Contributor

hedning commented Mar 16, 2019

I think 0.50 can cause quite a bit of trouble for us eg. mesonbuild/meson#5049

So 0.49.2 might be better for now.

@jtojnar jtojnar added the 2.status: wait-for-upstream Waiting for upstream fix (or their other action). label Mar 16, 2019
@jtojnar
Copy link
Member Author

jtojnar commented Mar 16, 2019

Should we do that in GNOME branch?

@hedning
Copy link
Contributor

hedning commented Mar 16, 2019

staging/staging-next is pretty broken ATM, so might be just as well to do it there (edit: gnome branch that is)

@infinisil infinisil added the 8.has: package (update) This PR updates a package to a newer version label Mar 30, 2019
@worldofpeace
Copy link
Contributor

I think the blocking issue appears to have been resolved upstream.

@jtojnar jtojnar changed the title meson: 0.49.1 → 0.50.0 meson: 0.49.1 → 0.50.1 Apr 26, 2019
@jtojnar jtojnar removed the 2.status: wait-for-upstream Waiting for upstream fix (or their other action). label Apr 26, 2019
@jtojnar
Copy link
Member Author

jtojnar commented Apr 30, 2019

Possibly depends on #60457

@jtojnar
Copy link
Member Author

jtojnar commented Apr 30, 2019

@worldofpeace
Copy link
Contributor

I suspect this will be a more common issue https://gitlab.gnome.org/GNOME/at-spi2-core/commit/e5c55c26a5d21fff1b88c90ee7aee4269788797c

Yep, we'll probably see fixes for that (or make them) in lots of places.

@jtojnar
Copy link
Member Author

jtojnar commented Jun 17, 2019

@jtojnar jtojnar changed the title meson: 0.49.1 → 0.50.1 meson: 0.49.1 → 0.51.0 Jun 17, 2019
@jtojnar
Copy link
Member Author

jtojnar commented Jun 17, 2019

json-glib, fwupd and python3.pkgs.pycairo build fine with Meson 0.51.0 but gnome3.gnome-settings-daemon fails:

@nix { "action": "setPhase", "phase": "unpackPhase" }
unpacking sources
unpacking source archive /nix/store/xgzjz14giw3csxris742ngwdrcka179i-gnome-settings-daemon-3.32.0.tar.xz
source root is gnome-settings-daemon-3.32.0
setting SOURCE_DATE_EPOCH to timestamp 1552344230 of file gnome-settings-daemon-3.32.0/subprojects/gvc/tests-include/config.h
@nix { "action": "setPhase", "phase": "patchPhase" }
patching sources
applying patch /nix/store/p1vcqqbbslwkq03vwx2hwpy9q24k4sgx-fix-paths.patch
patching file plugins/datetime/tz.h
patching file plugins/mouse/gsd-mouse-manager.c
applying patch /nix/store/yymfgyah966ay6a75qwnd8fqpyvmd5n2-global-backlight-helper.patch
patching file plugins/power/gsd-backlight.c
patching file plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
patching script interpreter paths in gnome-settings-daemon/codegen.py
gnome-settings-daemon/codegen.py: interpreter directive changed from "/usr/bin/env python3" to "/nix/store/4w1rxv6wfkv728jzmm6pqq3jsqd4yvi7-python3-3.7.3/bin/python3"
patching script interpreter paths in plugins/power/gsd-power-constants-update.pl
plugins/power/gsd-power-constants-update.pl: interpreter directive changed from "/usr/bin/env perl" to "/nix/store/39fa4mfb3lmrmh3m3k461vhjilhwc5vl-perl-5.28.2/bin/perl"
patching script interpreter paths in meson_post_install.py
meson_post_install.py: interpreter directive changed from "/usr/bin/env python3" to "/nix/store/4w1rxv6wfkv728jzmm6pqq3jsqd4yvi7-python3-3.7.3/bin/python3"
@nix { "action": "setPhase", "phase": "configurePhase" }
configuring
meson flags: --buildtype=release         --libdir=/nix/store/izhkvdw6kpi7lvxpwz0kzwbzy87ncwbp-gnome-settings-daemon-3.32.0/lib --libexecdir=/nix/store/izhkvdw6kpi7lvxpwz0kzwbzy87ncwbp-gnome-settings-daemon-3.32.0/libexec         --bindir=/nix/store/izhkvdw6kpi7lvxpwz0kzwbzy87ncwbp-gnome-settings-daemon-3.32.0/bin --sbindir=/nix/store/izhkvdw6kpi7lvxpwz0kzwbzy87ncwbp-gnome-settings-daemon-3.32.0/sbin         --includedir=/nix/store/izhkvdw6kpi7lvxpwz0kzwbzy87ncwbp-gnome-settings-daemon-3.32.0/include         --mandir=/nix/store/izhkvdw6kpi7lvxpwz0kzwbzy87ncwbp-gnome-settings-daemon-3.32.0/share/man --infodir=/nix/store/izhkvdw6kpi7lvxpwz0kzwbzy87ncwbp-gnome-settings-daemon-3.32.0/share/info         --localedir=/nix/store/izhkvdw6kpi7lvxpwz0kzwbzy87ncwbp-gnome-settings-daemon-3.32.0/share/locale         -Dauto_features=disabled         --prefix=/nix/store/izhkvdw6kpi7lvxpwz0kzwbzy87ncwbp-gnome-settings-daemon-3.32.0 -Dudev_dir=/nix/store/izhkvdw6kpi7lvxpwz0kzwbzy87ncwbp-gnome-settings-daemon-3.32.0/lib/udev 
The Meson build system
Version: 0.51.0
Source dir: /build/gnome-settings-daemon-3.32.0
Build dir: /build/gnome-settings-daemon-3.32.0/build
Build type: native build
DEPRECATION: Duplicated values in array option is deprecated. This will become a hard error in the future.
Project name: gnome-settings-daemon
Project version: 3.32.0
C compiler for the build machine: /nix/store/1ap5d85630s3ksal6xgkjnbglmbng3kg-gcc-wrapper-7.4.0/bin/cc (gcc 7.4.0 "gcc (GCC) 7.4.0")
C compiler for the host machine: /nix/store/1ap5d85630s3ksal6xgkjnbglmbng3kg-gcc-wrapper-7.4.0/bin/cc (gcc 7.4.0 "gcc (GCC) 7.4.0")
Build machine cpu family: x86_64
Build machine cpu: x86_64
meson.build:79: WARNING: Trying to compare values of different types (str, bool) using ==.
The result of this is undefined and will become a hard error in a future Meson release.
Found pkg-config: /nix/store/bvmnh4l0fqccp1f2ym1csf7269mf9bl6-pkg-config-0.29.2/bin/pkg-config (0.29.2)
Run-time dependency glib-2.0 found: YES 2.60.2
Run-time dependency colord found: YES 1.4.4
Run-time dependency geocode-glib-1.0 found: YES 3.26.1
Run-time dependency gio-2.0 found: YES 2.60.2
Run-time dependency gio-unix-2.0 found: YES 2.60.2
Run-time dependency gnome-desktop-3.0 found: YES 3.32.2
Run-time dependency gsettings-desktop-schemas found: YES 3.32.0
Run-time dependency gtk+-3.0 found: YES 3.24.8
Run-time dependency gtk+-x11-3.0 found: YES 3.24.8
Run-time dependency gweather-3.0 found: YES 3.32.1
Run-time dependency lcms2 found: YES 2.9
Run-time dependency libcanberra-gtk3 found: YES 0.30
Run-time dependency libgeoclue-2.0 found: YES 2.5.3
Run-time dependency libnotify found: YES 0.7.8
Run-time dependency libpulse-mainloop-glib found: YES 12.2-rebootstrapped
Run-time dependency pango found: YES 1.43.0
Run-time dependency polkit-gobject-1 found: YES 0.116
Run-time dependency upower-glib found: YES 0.99.10
Run-time dependency x11 found: YES 1.6.7
Library m found: YES

|Executing subproject gvc method meson 
|
|DEPRECATION: Duplicated values in array option is deprecated. This will become a hard error in the future.
|Project name: gvc
|Project version: undefined
|C compiler for the build machine: /nix/store/1ap5d85630s3ksal6xgkjnbglmbng3kg-gcc-wrapper-7.4.0/bin/cc (gcc 7.4.0 "gcc (GCC) 7.4.0")
|C compiler for the host machine: /nix/store/1ap5d85630s3ksal6xgkjnbglmbng3kg-gcc-wrapper-7.4.0/bin/cc (gcc 7.4.0 "gcc (GCC) 7.4.0")
|Dependency gio-2.0 found: YES (cached)
|Run-time dependency gobject-2.0 found: YES 2.60.2
|Run-time dependency libpulse found: YES 12.2-rebootstrapped
|Dependency libpulse-mainloop-glib found: YES (cached)
|Run-time dependency alsa found: YES 1.1.9
|Configuring config.h using configuration
|Build targets in project: 2
|Subproject gvc finished.

Run-time dependency gudev-1.0 found: YES 232
Checking for function "timerfd_create" : YES 
Run-time dependency wayland-client found: YES 1.17.0
Run-time dependency gdk-wayland-3.0 found: YES 3.24.8
Run-time dependency libwacom found: YES 0.33
Run-time dependency nss found: YES 3.44.0
cups-config found: YES (/nix/store/v35q8m8na995l0vfizyksr8w4prdip6x-cups-2.2.11-dev/bin/cups-config) 2.2.11
Run-time dependency cups found: YES 2.2.11
Has header "linux/rfkill.h" : YES 
Run-time dependency libnm found: YES 1.18.0
Program codegen.py found: YES (/build/gnome-settings-daemon-3.32.0/gnome-settings-daemon/codegen.py)
WARNING: Project targetting '>= 0.44.0' but tried to use feature introduced in '0.50.0': install arg in configure_file
Configuring org.gnome.settings-daemon.peripherals.gschema.xml using configuration
Configuring org.gnome.settings-daemon.peripherals.wacom.gschema.xml using configuration
Configuring org.gnome.settings-daemon.plugins.gschema.xml using configuration
Configuring org.gnome.settings-daemon.plugins.color.gschema.xml using configuration
Configuring org.gnome.settings-daemon.plugins.housekeeping.gschema.xml using configuration
Configuring org.gnome.settings-daemon.plugins.media-keys.gschema.xml using configuration
Configuring org.gnome.settings-daemon.plugins.power.gschema.xml using configuration
Configuring org.gnome.settings-daemon.plugins.sharing.gschema.xml using configuration
Configuring org.gnome.settings-daemon.plugins.xsettings.gschema.xml using configuration
Program glib-compile-schemas found: YES (/nix/store/nx6bjfdbjb7mizammy9w4sy0ilmw2had-glib-2.60.2-dev/bin/glib-compile-schemas)
Found pkg-config: /nix/store/bvmnh4l0fqccp1f2ym1csf7269mf9bl6-pkg-config-0.29.2/bin/pkg-config (0.29.2)
WARNING: Could not detect glib version, assuming 2.54. You may get build errors if your glib is older.
Run-time dependency kbproto found: YES 1.0.7
Run-time dependency xi found: YES 1.7.9
Configuring org.gnome.SettingsDaemon.A11ySettings.desktop using configuration
Configuring org.gnome.SettingsDaemon.Clipboard.desktop using configuration
Configuring org.gnome.SettingsDaemon.Color.desktop using configuration
Configuring org.gnome.SettingsDaemon.Datetime.desktop using configuration
Configuring org.gnome.SettingsDaemon.Power.desktop using configuration
Run-time dependency xext found: YES 1.3.4
Did not find CMake 'cmake'
Found CMake: NO
Build-time dependency glib-2.0 found: NO (tried pkgconfig)

plugins/power/meson.build:22:0: ERROR: Dependency "glib-2.0" not found, tried pkgconfig

A full log can be found at /build/gnome-settings-daemon-3.32.0/build/meson-logs/meson-log.txt

@jtojnar
Copy link
Member Author

jtojnar commented Jun 17, 2019

Similar failure for Sway:

@nix { "action": "setPhase", "phase": "unpackPhase" }
unpacking sources
unpacking source archive /nix/store/m5bciwjgsadybzisiad15g54fhikhngg-source
source root is source
@nix { "action": "setPhase", "phase": "patchPhase" }
patching sources
applying patch /nix/store/l4g7lb333j3bm1qsfx723ymaqhwy85mi-sway-config-no-nix-store-references.patch
patching file config.in
applying patch /nix/store/sdmqf08f6l6wmqapm0ibys0a0s82hk3h-load-configuration-from-etc.patch
patching file meson.build
patching file sway/config.c
Hunk #1 succeeded at 358 (offset 41 lines).
@nix { "action": "setPhase", "phase": "configurePhase" }
configuring
meson flags: --buildtype=release         --libdir=/nix/store/mlia4vm6mmrymwxwxcdzbq0d9vyqllxf-sway-1.1.1/lib --libexecdir=/nix/store/mlia4vm6mmrymwxwxcdzbq0d9vyqllxf-sway-1.1.1/libexec         --bindir=/nix/store/mlia4vm6mmrymwxwxcdzbq0d9vyqllxf-sway-1.1.1/bin --sbindir=/nix/store/mlia4vm6mmrymwxwxcdzbq0d9vyqllxf-sway-1.1.1/sbin         --includedir=/nix/store/mlia4vm6mmrymwxwxcdzbq0d9vyqllxf-sway-1.1.1/include         --mandir=/nix/store/mlia4vm6mmrymwxwxcdzbq0d9vyqllxf-sway-1.1.1/share/man --infodir=/nix/store/mlia4vm6mmrymwxwxcdzbq0d9vyqllxf-sway-1.1.1/share/info         --localedir=/nix/store/mlia4vm6mmrymwxwxcdzbq0d9vyqllxf-sway-1.1.1/share/locale         -Dauto_features=disabled         --prefix=/nix/store/mlia4vm6mmrymwxwxcdzbq0d9vyqllxf-sway-1.1.1 -Ddefault-wallpaper=false -Dxwayland=enabled -Dgdk-pixbuf=enabled -Dtray=enabled -Dman-pages=enabled 
The Meson build system
Version: 0.51.0
Source dir: /build/source
Build dir: /build/source/build
Build type: native build
DEPRECATION: Duplicated values in array option is deprecated. This will become a hard error in the future.
Project name: sway
Project version: 1.1.1
C compiler for the build machine: /nix/store/1ap5d85630s3ksal6xgkjnbglmbng3kg-gcc-wrapper-7.4.0/bin/cc (gcc 7.4.0 "gcc (GCC) 7.4.0")
C compiler for the host machine: /nix/store/1ap5d85630s3ksal6xgkjnbglmbng3kg-gcc-wrapper-7.4.0/bin/cc (gcc 7.4.0 "gcc (GCC) 7.4.0")
Build machine cpu family: x86_64
Build machine cpu: x86_64
Found pkg-config: /nix/store/bvmnh4l0fqccp1f2ym1csf7269mf9bl6-pkg-config-0.29.2/bin/pkg-config (0.29.2)
Run-time dependency json-c found: YES 0.13.1
Run-time dependency libpcre found: YES 8.43
Run-time dependency wayland-server found: YES 1.17.0
Run-time dependency wayland-client found: YES 1.17.0
Run-time dependency wayland-cursor found: YES 1.17.0
Run-time dependency wayland-egl found: YES 18.1.0
Run-time dependency wayland-protocols found: YES 1.17
Run-time dependency xkbcommon found: YES 0.8.0
Run-time dependency cairo found: YES 1.16.0
Run-time dependency pango found: YES 1.43.0
Run-time dependency pangocairo found: YES 1.43.0
Run-time dependency gdk-pixbuf-2.0 found: YES 2.38.1
Run-time dependency pixman-1 found: YES 0.38.4
Run-time dependency libevdev found: YES 1.6.0
Run-time dependency libinput found: YES 1.13.2
Run-time dependency libsystemd found: YES 239
Did not find CMake 'cmake'
Found CMake: NO
Run-time dependency libelogind found: NO (tried pkgconfig and cmake)
Run-time dependency xcb found: YES 1.13.1
Library m found: YES
Library rt found: YES
Program git found: NO
Subproject directory not found and wlroots.wrap file not found
Subproject  subprojects/wlroots is buildable: NO (disabling)
Run-time dependency wlroots found: YES 0.6.0.0
Fetching value of define "WLR_HAS_XWAYLAND" with dependency wlroots: 1 
Found pkg-config: /nix/store/bvmnh4l0fqccp1f2ym1csf7269mf9bl6-pkg-config-0.29.2/bin/pkg-config (0.29.2)
Did not find CMake 'cmake'
Found CMake: NO
Build-time dependency scdoc found: NO (tried pkgconfig)

meson.build:98:0: ERROR: Dependency "scdoc" not found, tried pkgconfig

A full log can be found at /build/source/build/meson-logs/meson-log.txt

It appears that dependencies are sometimes not found in subprojects.

@jtojnar
Copy link
Member Author

jtojnar commented Jun 18, 2019

I opened mesonbuild/meson#5502 but until a fix is released, we should probably stay on 0.50.1.

@jtojnar jtojnar changed the title meson: 0.49.1 → 0.51.0 meson: 0.49.1 → 0.50.1 Jun 18, 2019
@jtojnar
Copy link
Member Author

jtojnar commented Jun 19, 2019

GNOME built with Meson 0.50.1 runs fine. Let’s merge and see if anything breaks.

@jtojnar jtojnar changed the base branch from master to staging June 19, 2019 11:38
@jtojnar jtojnar merged commit 9e9cf6a into NixOS:staging Jun 19, 2019
@jtojnar jtojnar deleted the meson-0.50 branch June 19, 2019 14:15
@worldofpeace worldofpeace mentioned this pull request Jul 6, 2019
10 tasks
@Miaourt
Copy link

Miaourt commented Jul 14, 2019

I get the

Did not find CMake 'cmake' 
Found CMake: NO 

Build-time dependency scdoc found: NO (tried pkgconfig)

Error when I try to build kanshi :(

@jtojnar
Copy link
Member Author

jtojnar commented Jul 14, 2019

@Miaourt this was most likely caused by #63493. Though I do not see why kanshi would be affected when it does not use meson.

@Miaourt
Copy link

Miaourt commented Jul 14, 2019

I might have misinterpreted the issue, yet I can't copy nor pipe my terminal output because full noob here @.@ but the "builder" failing after all theses error mention "kanshi", sorry very unfamiliar with Nix

I'm using some kind of overlay, from nixpkgs-wayland, but the error is totally the same than the one you posted here (edited to be the exact same than mine) :

Did not find CMake 'cmake'
Found CMake: NO
Dependency scdoc found: NO (tried pkgconfig)

meson.build:52:0: ERROR: Dependency "scdoc" not found, tried pkgconfig

It's totally unrelated it seem, like you said, but this is the only place where I see a similar issue and I don't know where to dig more to fix this error I have.

Is there a place more fit to this kind of support than a pull request ?

@jtojnar
Copy link
Member Author

jtojnar commented Jul 14, 2019

The error I posted is the result of mesonbuild/meson#5502. Your issue produces similar error message but for a different reason (enabling of all features in #63493).

Kanshi is probably only mentioned because it was building at the same time a package producing the error failed.

The error is probably caused by sway or related package in the overlay, as you suggest. The overlay needs to be updated in line with #63493 as described in https://discourse.nixos.org/t/psa-meson-now-building-all-auto-detected-features/3271.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

6 participants