meson: try some system libs first #1866
Open
+24
−12
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
abouvier
force-pushed
the
meson-unbundle
branch
4 times, most recently
from
9821400 to
ecc0624
Compare
abouvier
force-pushed
the
meson-unbundle
branch
from
ecc0624 to
cdb94b3
Compare
mborgerson
reviewed
Jan 15, 2025
| @@ -2,3 +2,4 @@ | |||
| url=https://github.com/KhronosGroup/SPIRV-Reflect | |||
| revision=vulkan-sdk-1.3.296.0 | |||
| depth=1 | |||
| method=cmake | |||
There was a problem hiding this comment.
- Is this necessary? Since meson.build already uses the CMake module to handle this wrap, I'm not sure why this change is required.
methodlooks to be introduced with Meson v1.3.0, but meson.build requires meson_version: '>=1.1.0'. If it really is required, then we need to bump the minimum Meson version.
There was a problem hiding this comment.
meson subprojects download exits with an error code when cmake subprojects exists:
$ meson subprojects download
(...)
Download nv2a_vsh_cpu...
-> Subproject exists but has no meson.build file.
(...)
Download SPIRV-Reflect...
-> Subproject exists but has no meson.build file.
(...)
WARNING: Please check logs above as command failed in some subprojects which could have been left in conflict state: SPIRV-Reflect, VulkanMemoryAllocator, glslang, nv2a_vsh_cpu, volk
$ echo $?
5
mborgerson
reviewed
Jan 15, 2025
|
|
||
| libfatx = static_library('fatx', sources: 'fatx/fatx.c') | ||
| libfatx = static_library('fatx', sources: files('fatx/fatx.c') + genh) |
There was a problem hiding this comment.
Why does libfatx now depend on genh?
There was a problem hiding this comment.
Because otherwise you get this error:
[13/1482] Linking static target thirdparty/libvma.a
samu: job failed: cc -Iui/thirdparty/libfatx.a.p -Iui/thirdparty -I../xemu/ui/thirdparty -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/sysprof-6 -fdiagnostics-color=auto -Wall -Winvalid-pch -std=gnu11 -Wempty-body -Wendif-labels -Wexpansion-to-defined -Wformat-security -Wformat-y2k -Wignored-qualifiers -Wimplicit-fallthrough=2 -Winit-self -Wmissing-format-attribute -Wmissing-prototypes -Wnested-externs -Wold-style-declaration -Wold-style-definition -Wredundant-decls -Wshadow=local -Wstrict-prototypes -Wtype-limits -Wwrite-strings -Wno-missing-include-dirs -Wno-psabi -Wno-shift-negative-value -isystem /build/xemu-git/src/xemu/linux-headers -isystem linux-headers -iquote . -iquote /build/xemu-git/src/xemu -iquote /build/xemu-git/src/xemu/include -iquote /build/xemu-git/src/xemu/host/include/x86_64 -iquote /build/xemu-git/src/xemu/host/include/generic -iquote /build/xemu-git/src/xemu/tcg/i386 -pthread -mcx16 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -fno-strict-aliasing -fno-common -fwrapv -ftrivial-auto-var-init=zero -fzero-call-used-regs=used-gpr -march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security -fstack-clash-protection -fcf-protection -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -flto=auto -DXBOX=1 -fPIE -MD -MQ ui/thirdparty/libfatx.a.p/fatx_fatx.c.o -MF ui/thirdparty/libfatx.a.p/fatx_fatx.c.o.d -o ui/thirdparty/libfatx.a.p/fatx_fatx.c.o -c ../xemu/ui/thirdparty/fatx/fatx.c
In file included from /build/xemu-git/src/xemu/include/qemu/osdep.h:38,
from ../xemu/ui/thirdparty/fatx/fatx.h:4,
from ../xemu/ui/thirdparty/fatx/fatx.c:1:
/build/xemu-git/src/xemu/include/exec/poison.h:7:10: fatal error: config-poison.h: No such file or directory
7 | #include "config-poison.h"
| ^~~~~~~~~~~~~~~~~
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
volk,VMAandSPIRV-Reflectcould be unbundled too ;)