Skip to contentSkip to conversation

curl: strip the build machine triplet from curl-config

PATCH New [email protected] 1 participant 1 message Sep 27

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 curl: strip the build machine triplet from curl-config

From: Sunil Dora <[email protected]>

curl-config echoes the configure arguments, which include --build=${BUILD_SYS} and build_alias=${BUILD_SYS}. That is the machine the package was built on, so curl-dev differs between the x86_64 and aarch64 autobuilder workers. Drop both tokens in fix_absolute_paths, which already scrubs this file; an empty --build= would not be valid, so they are removed rather than blanked.

[YOCTO #16376]

---
 meta/recipes-support/curl/curl_8.22.0.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-support/curl/curl_8.22.0.bb +3 -1
index 3ccfcf7f2d..96f889165e 100644
@@ -92,12 +92,14 @@ EXTRA_OECONF = " \
 "
 
 fix_absolute_paths () {
-	# cleanup buildpaths from curl-config
+	# cleanup buildpaths and the build host triple from curl-config
 	sed -i \
 	    -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
 	    -e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \
 	    -e 's|${DEBUG_PREFIX_MAP}||g' \
 	    -e 's|${@" ".join(d.getVar("DEBUG_PREFIX_MAP").split())}||g' \
+	    -e "s,'--build=${BUILD_SYS}' ,,g" \
+	    -e "s,'build_alias=${BUILD_SYS}' ,,g" \
 	    ${D}${bindir}/curl-config
 }
 
Signature · 1 line
2.49.0