diff options
| author | Ross Burton <ross.burton@arm.com> | 2023-01-11 14:17:53 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-26 23:39:06 +0000 |
| commit | 078af1e3cb6eed5f22da9e4ddfbb19d531b3af04 (patch) | |
| tree | 865736cbe03e88644d94f17e4403264ca2bf89e3 /meta | |
| parent | f04df58fb02c40f4a33064ce44a1cfbb2ae286f7 (diff) | |
| download | poky-078af1e3cb6eed5f22da9e4ddfbb19d531b3af04.tar.gz | |
curl: don't enable debug builds
In oe-core 27824261 --enable-debug was added to the configure arguments
to turn on debugging symbols. However, enabling debug mode does more
than turn on debugging symbols and introduces some codepaths that can be
controlled with environment variables. Bluntly, the curl maintainer
says that --enable-debug should not be used in production:
https://curl.se/mail/lib-2023-01/0039.html
I did a build and verified that the curl-dbg package doesn't massively
shrink, so the debug symbols are still being built.
Remove the debug options and hide them behind a PACKAGECONFIG, with a
comment that it should not be used in production.
(From OE-Core rev: dea11274a6ed33a9c20909b8adb81ce9b9bcd1a5)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3ed3b2ffeeaa5d888f77dd30cb8cd81d3275398a)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-support/curl/curl_7.85.0.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-support/curl/curl_7.85.0.bb b/meta/recipes-support/curl/curl_7.85.0.bb index 1e47e9fac5..846cdacb41 100644 --- a/meta/recipes-support/curl/curl_7.85.0.bb +++ b/meta/recipes-support/curl/curl_7.85.0.bb | |||
| @@ -38,6 +38,8 @@ PACKAGECONFIG:class-nativesdk = "ipv6 openssl proxy random threaded-resolver ver | |||
| 38 | PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" | 38 | PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" |
| 39 | PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" | 39 | PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" |
| 40 | PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" | 40 | PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" |
| 41 | # Don't use this in production | ||
| 42 | PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" | ||
| 41 | PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," | 43 | PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," |
| 42 | PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" | 44 | PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" |
| 43 | PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher," | 45 | PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher," |
| @@ -74,9 +76,7 @@ EXTRA_OECONF = " \ | |||
| 74 | --enable-crypto-auth \ | 76 | --enable-crypto-auth \ |
| 75 | --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ | 77 | --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ |
| 76 | --without-libpsl \ | 78 | --without-libpsl \ |
| 77 | --enable-debug \ | ||
| 78 | --enable-optimize \ | 79 | --enable-optimize \ |
| 79 | --disable-curldebug \ | ||
| 80 | ${@'--without-ssl' if (bb.utils.filter('PACKAGECONFIG', 'gnutls mbedtls nss openssl', d) == '') else ''} \ | 80 | ${@'--without-ssl' if (bb.utils.filter('PACKAGECONFIG', 'gnutls mbedtls nss openssl', d) == '') else ''} \ |
| 81 | " | 81 | " |
| 82 | 82 | ||
