diff options
| -rw-r--r-- | meta-oe/recipes-support/liboauth2/liboauth2/0001-build-guard-coverage-linker-flag-behind-CODE_COVERAG.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-support/liboauth2/liboauth2_2.2.0.bb | 3 |
2 files changed, 35 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/liboauth2/liboauth2/0001-build-guard-coverage-linker-flag-behind-CODE_COVERAG.patch b/meta-oe/recipes-support/liboauth2/liboauth2/0001-build-guard-coverage-linker-flag-behind-CODE_COVERAG.patch new file mode 100644 index 0000000000..f234cbd50b --- /dev/null +++ b/meta-oe/recipes-support/liboauth2/liboauth2/0001-build-guard-coverage-linker-flag-behind-CODE_COVERAG.patch | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | From 7c70315f7f6b4305d761804fb03f8f90ad7572eb Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 3 | Date: Fri, 17 Apr 2026 14:01:46 -0700 | ||
| 4 | Subject: [PATCH] build: guard --coverage linker flag behind | ||
| 5 | CODE_COVERAGE_ENABLED | ||
| 6 | |||
| 7 | AM_LDFLAGS passes --coverage to the linker unconditionally, | ||
| 8 | it causes coverage instrumentation to be enabled even when | ||
| 9 | configured with --disable-code-coverage. Wrap it in the | ||
| 10 | automake conditional provided by AX_CODE_COVERAGE. | ||
| 11 | |||
| 12 | Upstream-Status: Submitted [https://github.com/OpenIDC/liboauth2/pull/74] | ||
| 13 | Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 14 | --- | ||
| 15 | Makefile.am | 5 ++++- | ||
| 16 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/Makefile.am b/Makefile.am | ||
| 19 | index a079dcc..a3f991d 100644 | ||
| 20 | --- a/Makefile.am | ||
| 21 | +++ b/Makefile.am | ||
| 22 | @@ -8,7 +8,10 @@ EXTRA_DIST = autogen.sh ChangeLog README.md LICENSE | ||
| 23 | |||
| 24 | AM_CPPFLAGS = -Wall -Werror -Wno-error=deprecated-declarations -I${srcdir}/include -I${srcdir}/src @JANSSON_CFLAGS@ @OPENSSL_CFLAGS@ | ||
| 25 | AM_CPPFLAGS += $(CODE_COVERAGE_CPPFLAGS) $(CODE_COVERAGE_CFLAGS) | ||
| 26 | -AM_LDFLAGS = --coverage | ||
| 27 | +AM_LDFLAGS = | ||
| 28 | +if CODE_COVERAGE_ENABLED | ||
| 29 | +AM_LDFLAGS += --coverage | ||
| 30 | +endif | ||
| 31 | |||
| 32 | LDADD = @JANSSON_LIBS@ @OPENSSL_LIBS@ | ||
| 33 | LDADD += $(CODE_COVERAGE_LIBS) | ||
diff --git a/meta-oe/recipes-support/liboauth2/liboauth2_2.2.0.bb b/meta-oe/recipes-support/liboauth2/liboauth2_2.2.0.bb index 5b1ecd23dd..83825c69a5 100644 --- a/meta-oe/recipes-support/liboauth2/liboauth2_2.2.0.bb +++ b/meta-oe/recipes-support/liboauth2/liboauth2_2.2.0.bb | |||
| @@ -7,6 +7,7 @@ SRC_URI = " \ | |||
| 7 | git://github.com/OpenIDC/liboauth2;protocol=https;branch=master;tag=v${PV} \ | 7 | git://github.com/OpenIDC/liboauth2;protocol=https;branch=master;tag=v${PV} \ |
| 8 | file://0001-fix-clang-curl_easy_setopt-takes-a-long-not-an-int.patch \ | 8 | file://0001-fix-clang-curl_easy_setopt-takes-a-long-not-an-int.patch \ |
| 9 | file://0002-Fix-use-of-strchr-with-new-GCC.patch \ | 9 | file://0002-Fix-use-of-strchr-with-new-GCC.patch \ |
| 10 | file://0001-build-guard-coverage-linker-flag-behind-CODE_COVERAG.patch \ | ||
| 10 | " | 11 | " |
| 11 | 12 | ||
| 12 | SRCREV = "12571b6d6568c2db7d5f080f60ecb55795c0db19" | 13 | SRCREV = "12571b6d6568c2db7d5f080f60ecb55795c0db19" |
| @@ -20,4 +21,4 @@ PACKAGECONFIG[memcache] = "--with-memcache,--without-memcache,libmemcached" | |||
| 20 | PACKAGECONFIG[redis] = "--with-redis,--without-redis,hiredis" | 21 | PACKAGECONFIG[redis] = "--with-redis,--without-redis,hiredis" |
| 21 | PACKAGECONFIG[jq] = "--with-jq,--without-jq,jq" | 22 | PACKAGECONFIG[jq] = "--with-jq,--without-jq,jq" |
| 22 | PACKAGECONFIG[apache] = "--with-apache,--without-apache,apache2" | 23 | PACKAGECONFIG[apache] = "--with-apache,--without-apache,apache2" |
| 23 | 24 | PACKAGECONFIG[ccov] = "--enable-code-coverage,--disable-code-coverage," | |
