diff options
Diffstat (limited to 'meta/recipes-support/libical')
-rw-r--r-- | meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch | 7 | ||||
-rw-r--r-- | meta/recipes-support/libical/libical_3.0.20.bb (renamed from meta/recipes-support/libical/libical_3.0.18.bb) | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch b/meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch index 3841c060ee..0f0dadb4e4 100644 --- a/meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch +++ b/meta/recipes-support/libical/libical/0001-cmake-Do-not-export-CC-into-gir-compiler.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c06d8a8990c996cbb854508a944202ba70ba7a7c Mon Sep 17 00:00:00 2001 | 1 | From 7b20ca7f24a4cac25998bfcc70eed75bf796816b Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 3 Mar 2022 20:10:04 -0800 | 3 | Date: Thu, 3 Mar 2022 20:10:04 -0800 |
4 | Subject: [PATCH] cmake: Do not export CC into gir compiler | 4 | Subject: [PATCH] cmake: Do not export CC into gir compiler |
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
15 | 1 file changed, 1 insertion(+), 2 deletions(-) | 15 | 1 file changed, 1 insertion(+), 2 deletions(-) |
16 | 16 | ||
17 | diff --git a/cmake/modules/GObjectIntrospectionMacros.cmake b/cmake/modules/GObjectIntrospectionMacros.cmake | 17 | diff --git a/cmake/modules/GObjectIntrospectionMacros.cmake b/cmake/modules/GObjectIntrospectionMacros.cmake |
18 | index 83aff931..d7d3f898 100644 | 18 | index 83aff93..d7d3f89 100644 |
19 | --- a/cmake/modules/GObjectIntrospectionMacros.cmake | 19 | --- a/cmake/modules/GObjectIntrospectionMacros.cmake |
20 | +++ b/cmake/modules/GObjectIntrospectionMacros.cmake | 20 | +++ b/cmake/modules/GObjectIntrospectionMacros.cmake |
21 | @@ -50,8 +50,7 @@ macro(gir_add_introspections introspections_girs) | 21 | @@ -50,8 +50,7 @@ macro(gir_add_introspections introspections_girs) |
@@ -28,6 +28,3 @@ index 83aff931..d7d3f898 100644 | |||
28 | ${GObjectIntrospection_SCANNER_ARGS} | 28 | ${GObjectIntrospection_SCANNER_ARGS} |
29 | --namespace=${_gir_namespace} | 29 | --namespace=${_gir_namespace} |
30 | --nsversion=${_gir_version} | 30 | --nsversion=${_gir_version} |
31 | -- | ||
32 | 2.35.1 | ||
33 | |||
diff --git a/meta/recipes-support/libical/libical_3.0.18.bb b/meta/recipes-support/libical/libical_3.0.20.bb index 040d23b69d..d62c88e347 100644 --- a/meta/recipes-support/libical/libical_3.0.18.bb +++ b/meta/recipes-support/libical/libical_3.0.20.bb | |||
@@ -15,7 +15,7 @@ SECTION = "libs" | |||
15 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ | 15 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ |
16 | file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \ | 16 | file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \ |
17 | " | 17 | " |
18 | SRC_URI[sha256sum] = "72b7dc1a5937533aee5a2baefc990983b66b141dd80d43b51f80aced4aae219c" | 18 | SRC_URI[sha256sum] = "e73de92f5a6ce84c1b00306446b290a2b08cdf0a80988eca0a2c9d5c3510b4c2" |
19 | 19 | ||
20 | inherit cmake pkgconfig gobject-introspection vala github-releases | 20 | inherit cmake pkgconfig gobject-introspection vala github-releases |
21 | 21 | ||
@@ -37,7 +37,8 @@ EXTRA_OECMAKE += "-DICAL_BUILD_DOCS=false" | |||
37 | EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper" | 37 | EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper" |
38 | EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper" | 38 | EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper" |
39 | EXTRA_OECMAKE += "-DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen" | 39 | EXTRA_OECMAKE += "-DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen" |
40 | EXTRA_OECMAKE += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DGOBJECT_INTROSPECTION=ON -DICAL_GLIB_VAPI=ON', '-DGOBJECT_INTROSPECTION=OFF', d)}" | 40 | EXTRA_OECMAKE += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DGOBJECT_INTROSPECTION=ON -DICAL_GLIB_VAPI=ON', '-DGOBJECT_INTROSPECTION=OFF -DICAL_GLIB_VAPI=OFF', d)}" |
41 | EXTRA_OECMAKE:append:class-native = " -DGOBJECT_INTROSPECTION=OFF -DICAL_GLIB_VAPI=OFF" | ||
41 | 42 | ||
42 | # Tell the cross-libical where the tool it needs to build is | 43 | # Tell the cross-libical where the tool it needs to build is |
43 | EXTRA_OECMAKE:append:class-target = " -DIMPORT_ICAL_GLIB_SRC_GENERATOR=${STAGING_LIBDIR_NATIVE}/cmake/LibIcal/IcalGlibSrcGenerator.cmake" | 44 | EXTRA_OECMAKE:append:class-target = " -DIMPORT_ICAL_GLIB_SRC_GENERATOR=${STAGING_LIBDIR_NATIVE}/cmake/LibIcal/IcalGlibSrcGenerator.cmake" |