Skip to contentSkip to conversation

libsoup-2.4: Only specify --cross-file when building for target

PATCH New Peter Kjellerstedt 1 participant 2 messages Sep 14, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 libsoup-2.4: Only specify --cross-file when building for target

The soup.cross file is only created when building for target so only tell meson to read it when it exists. This allows libsoup-2.4-native to be built again.

---
 meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb +1 -1
index 5abeced30b..a605857c60 100644
@@ -40,7 +40,7 @@ do_write_config:append:class-target() {
 ntlm_auth = '${bindir}/ntlm_auth'
 EOF
 }
-EXTRA_OEMESON += "--cross-file ${WORKDIR}/soup.cross"
+EXTRA_OEMESON:append:class-target = " --cross-file ${WORKDIR}/soup.cross"
 
 EXTRA_OEMESON += "-Dvapi=disabled -Dtls_check=false"
 
#1 lore raw

PATCH 2/2 libsoup: Only specify --cross-file when building for target

The soup.cross file is only created when building for target so only tell meson to read it when it exists. This allows libsoup-native to be built again.

---
 meta/recipes-support/libsoup/libsoup_3.4.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/libsoup/libsoup_3.4.2.bb +1 -1
index ad86c890a1..3996ae6836 100644
@@ -37,7 +37,7 @@ do_write_config:append:class-target() {
 ntlm_auth = '${bindir}/ntlm_auth'
 EOF
 }
-EXTRA_OEMESON += "--cross-file ${WORKDIR}/soup.cross"
+EXTRA_OEMESON:append:class-target = " --cross-file ${WORKDIR}/soup.cross"
 
 EXTRA_OEMESON += "-Dvapi=disabled -Dtls_check=false"
 # Disable the test suites