Upgrade to Wayland v1.23 #9035
Upgrade to Wayland v1.23 #9035
Conversation
jmert
force-pushed
the
wayland_1.23
branch
3 times, most recently
from
1a8cf9a to
41ce7e4
Compare
| meson .. \ | ||
| PKG_CONFIG_SYSROOT_DIR='' \ | ||
| PKG_CONFIG_PATH="${host_libdir}/pkgconfig" \ | ||
| meson setup host_build . \ |
There was a problem hiding this comment.
and at the same time, try to resolve a bootstrap issue with
wayland-scannerbeing a build-time dependency of building the other libraries.
It isn't clear to me why we shouldn't be using HostBuildDependency as it was done before.
There was a problem hiding this comment.
Trying to upgrade to v1.23 would only see the v1.21 version of wayland-scanner, and the build system would complain and abort. Trying to build the native & target from the same source was my way to resolve that issue.
There was a problem hiding this comment.
Explicitly, the error that occurs if only the version & hash are changed and a rebuild is attempted is:
...
[14:20:04] Build-time dependency wayland-scanner found: NO (tried cmake)
[14:20:04]
[14:20:04] ../src/meson.build:84:15: ERROR: Dependency lookup for wayland-scanner with method 'pkgconfig' failed: Invalid version, need 'wayland-scanner' ['1.23.0'] found '1.21.0'.
...
8e16825 to
10cd2d8
Compare
jmert
force-pushed
the
wayland_1.23
branch
2 times, most recently
from
4f4b247 to
e0f517e
Compare
At the same time, resolve a bootstrap issue wherein we cannot ask for the correct version of the host-system `wayland-scanner` if the host packages have not yet been built. Instead, perform a host-system compilation of just a utility `wayland-scanner`, and then in a second step perform the cross-compile of all of the Wayland libraries and a target-compatible `wayland-scanner`. - Note that the bootstrapping `wayland-scanner` purposely disables the DTD validation feature in order to work around a problem with properly linking the host's libxml2 when cross-compiling for FreeBSD.
Following JuliaPackaging/BinaryBuilder.jl#1346 and the rebuild of Expat_jll (JuliaPackaging#9791), the workaround for pkgconfig `.pc` files containing the build `prefix` is no longer necessary. (Is there a way to actually add the compat constraint to `HostBuildDepencency`s?)
Looks like some dependencies are missing on RISCV currently |
|
Libiconv now available for RISCV from #10258. I looked at the other three, and they don't have any newer upstream versions yet, so we need to figure out how to rebuild these. |
and at the same time, try to resolve a bootstrap issue with
wayland-scannerbeing a build-time dependency of building the other libraries.N.B. I don't have a FreeBSD system to test against, so I'm not sure if/how this preserves/breaks #7381, which to me seems like it introduce an chicken-vs-egg bootstrap problem.Latest build seems to cross-compile correctly.