48 lines
1.9 KiB
Diff
48 lines
1.9 KiB
Diff
|
From f698e21192b07335197e8a20032cbb411715775a Mon Sep 17 00:00:00 2001
|
||
|
|
From: gubin <gubin_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Sat, 11 Jan 2025 10:37:12 +0800
|
||
|
|
Subject: [PATCH] target/hexagon: don't look for static glib
|
||
|
|
|
||
|
|
cherry-pick from fe68cc0923ebfa0c12e4176f61ec9b363a07a73a
|
||
|
|
|
||
|
|
When cross compiling QEMU configured with --static, I've been getting
|
||
|
|
configure errors like the following:
|
||
|
|
|
||
|
|
Build-time dependency glib-2.0 found: NO
|
||
|
|
|
||
|
|
../target/hexagon/meson.build:303:15: ERROR: Dependency lookup for glib-2.0 with method 'pkgconfig' failed: Could not generate libs for glib-2.0:
|
||
|
|
Package libpcre2-8 was not found in the pkg-config search path.
|
||
|
|
Perhaps you should add the directory containing `libpcre2-8.pc'
|
||
|
|
to the PKG_CONFIG_PATH environment variable
|
||
|
|
Package 'libpcre2-8', required by 'glib-2.0', not found
|
||
|
|
|
||
|
|
This happens because --static sets the prefer_static Meson option, but
|
||
|
|
my build machine doesn't have a static libpcre2. I don't think it
|
||
|
|
makes sense to insist that native dependencies are static, just
|
||
|
|
because I want the non-native QEMU binaries to be static.
|
||
|
|
|
||
|
|
Signed-off-by: Alyssa Ross <hi@alyssa.is>
|
||
|
|
Link: https://lore.kernel.org/r/20240805104921.4035256-1-hi@alyssa.is
|
||
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
Signed-off-by: gubin <gubin_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
target/hexagon/meson.build | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build
|
||
|
|
index da8e608d00..436217f25a 100644
|
||
|
|
--- a/target/hexagon/meson.build
|
||
|
|
+++ b/target/hexagon/meson.build
|
||
|
|
@@ -188,7 +188,7 @@ if idef_parser_enabled and 'hexagon-linux-user' in target_dirs
|
||
|
|
arguments: ['@INPUT@', '--defines=@OUTPUT1@', '--output=@OUTPUT0@']
|
||
|
|
)
|
||
|
|
|
||
|
|
- glib_dep = dependency('glib-2.0', native: true)
|
||
|
|
+ glib_dep = dependency('glib-2.0', native: true, static: false)
|
||
|
|
|
||
|
|
idef_parser = executable(
|
||
|
|
'idef-parser',
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|