Hi Richard, > > From: Ricardo Simoes <[email protected]> > > > > When enabling mbedtls PACKAGECONFIG option, the curl-config and > > libcurl.pc are generated with paths to STAGE_DIR_TARGET, causing the > > QA check buildpaths to fail. This is due to the fact that the > mbedtls > > option uses the path to STAGING_DIR_TARGET to find the mbedtls > library. > > > > When installed, the curl-config and libcurl.pc will still need the > the > > flag '--with-mbedtls', but not with the path. Same is true for the > > library path flag. Thus drop the absolute paths from both files when > > mbedtls is enabled, and add the flag '--with-mbedtls' to the > > curl-config and libcurl.pc. > > > > Signed-off-by: Ricardo Simoes <[email protected]> > > Signed-off-by: Mark Jonas <[email protected]> > > --- > > meta/recipes-support/curl/curl_8.19.0.bb | 6 ++++-- > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/meta/recipes-support/curl/curl_8.19.0.bb > > b/meta/recipes-support/curl/curl_8.19.0.bb > > index b9251336b8..cc37cc934b 100644 > > --- a/meta/recipes-support/curl/curl_8.19.0.bb > > +++ b/meta/recipes-support/curl/curl_8.19.0.bb > > @@ -93,13 +93,15 @@ EXTRA_OECONF = " \ > > " > > > > fix_absolute_paths () { > > - # cleanup buildpaths from curl-config > > + # cleanup buildpaths from curl-config and libcurl.pc > > sed -i \ > > -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ > > -e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \ > > + -e 's,--with-mbedtls=${STAGING_DIR_TARGET},--with-mbedtls,g' > \ > > + -e 's,-L${STAGING_DIR_TARGET},,g' \ > > -e 's|${DEBUG_PREFIX_MAP}||g' \ > > -e 's|${@" ".join(d.getVar("DEBUG_PREFIX_MAP").split())}||g' > \ > > - ${D}${bindir}/curl-config > > + ${D}${bindir}/curl-config ${D}${libdir}/pkgconfig/libcurl.pc > > } > > > > do_install:append:class-target() { > > In most cases we don't need to edit .pc files. I'm concerned about > seeing this being added to the sed, we should fix the data coming into > .pc files in the first place. I'm really happy we don't need to change > many .pc files and I don't want to see us regress like this. > > curl-config is a different story unfortunately but can you see if the > .pc can be fixed at source please?
Thank you for looking at it and your feedback. We'll have a look at it and give it a try. So far we have zero experience with autoconf. In case somebody with autoconf experience is reading here and would like to give a hand, help is welcome. Cheers, Mark
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#237310): https://lists.openembedded.org/g/openembedded-core/message/237310 Mute This Topic: https://lists.openembedded.org/mt/119299519/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
