mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-10-01 12:22:20 +00:00
0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch 0001-cmake-Do-not-export-CC-into-gir-compiler.patch 0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch 0004-call-native-helpers.patch Bug Fixes: ========== - Pass GError instead of CamelException to camel_movemail_solaris - Fix argument types in ENABLE_BROKEN_SPOOL code - Use GIConv instead of iconv_t with iconv wrappers - ESoupSession: Sometimes accesses server without OAuth2 token Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
From 0f9763c77dcf44b1061517539287c79a59a6aede Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Sun, 6 Mar 2022 18:16:31 +0100
|
|
Subject: [PATCH] Use G_IR_SCANNER without passing additional environment
|
|
|
|
Upstream-Status: Inappropriate [OE-specific]
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
cmake/modules/GObjectIntrospection.cmake | 5 +----
|
|
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
|
|
diff --git a/cmake/modules/GObjectIntrospection.cmake b/cmake/modules/GObjectIntrospection.cmake
|
|
index 9d2e6e7..3d8bb8c 100644
|
|
--- a/cmake/modules/GObjectIntrospection.cmake
|
|
+++ b/cmake/modules/GObjectIntrospection.cmake
|
|
@@ -122,9 +122,7 @@ macro(gir_add_introspection gir)
|
|
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_gir_name}_files "${_gir_files}")
|
|
|
|
add_custom_command(
|
|
- COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" LDFLAGS=
|
|
- ${INTROSPECTION_SCANNER_ENV}
|
|
- ${G_IR_SCANNER}
|
|
+ COMMAND ${G_IR_SCANNER}
|
|
${INTROSPECTION_SCANNER_ARGS}
|
|
--namespace=${_gir_namespace}
|
|
--nsversion=${_gir_version}
|
|
@@ -240,7 +238,6 @@ macro(gir_add_introspection_simple gir_library pkg_export_prefix gir_library_ver
|
|
${_gir_identifies_prefixes}
|
|
${_gir_deps}
|
|
--add-include-path=${SHARE_INSTALL_PREFIX}/gir-1.0
|
|
- --library-path=${LIB_INSTALL_DIR}
|
|
${_extra_library_path}
|
|
--pkg-export ${pkg_export_prefix}-${gir_library_version}
|
|
--c-include=${c_include}
|