commit: 2f2316ccd5516c31dd42a90ffde9ff9ab89d9b88 Author: Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru> AuthorDate: Mon Oct 17 17:49:04 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Oct 20 23:34:16 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f2316cc
net-libs/libmicrohttpd: fixed tests with LTO Bug: https://bugs.gentoo.org/877447 Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru> Closes: https://github.com/gentoo/gentoo/pull/27823 Signed-off-by: Sam James <sam <AT> gentoo.org> ...bmicrohttpd-0.9.75-fix-testsuite-with-lto.patch | 60 ++++++++++++++++++++++ net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild | 3 +- net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild | 3 +- net-libs/libmicrohttpd/libmicrohttpd-0.9.74.ebuild | 2 + net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild | 2 + 5 files changed, 68 insertions(+), 2 deletions(-) diff --git a/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.75-fix-testsuite-with-lto.patch b/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.75-fix-testsuite-with-lto.patch new file mode 100644 index 000000000000..b87bdb64579f --- /dev/null +++ b/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.75-fix-testsuite-with-lto.patch @@ -0,0 +1,60 @@ +Fixed incorrect function redeclaration in the testsuite. +This fixes 'make check' with LTO. + +Author: Karlson2k (Evgeny Grin) +Gentoo bug: https://bugs.gentoo.org/877447 + + +diff --git a/src/testcurl/https/test_https_get_parallel.c b/src/testcurl/https/test_https_get_parallel.c +index 47f644d2..786918f2 100644 +--- a/src/testcurl/https/test_https_get_parallel.c ++++ b/src/testcurl/https/test_https_get_parallel.c +@@ -46,7 +46,7 @@ + extern const char srv_key_pem[]; + extern const char srv_self_signed_cert_pem[]; + +-int curl_check_version (const char *req_version, ...); ++int curl_check_version (const char *req_version); + + + /** +diff --git a/src/testcurl/https/test_https_get_parallel_threads.c b/src/testcurl/https/test_https_get_parallel_threads.c +index 4853e7eb..5f4d0486 100644 +--- a/src/testcurl/https/test_https_get_parallel_threads.c ++++ b/src/testcurl/https/test_https_get_parallel_threads.c +@@ -48,7 +48,7 @@ + extern const char srv_key_pem[]; + extern const char srv_self_signed_cert_pem[]; + +-int curl_check_version (const char *req_version, ...); ++int curl_check_version (const char *req_version); + + /** + * used when spawning multiple threads executing curl server requests +diff --git a/src/testcurl/https/test_tls_options.c b/src/testcurl/https/test_tls_options.c +index d5aa8310..8fbc540a 100644 +--- a/src/testcurl/https/test_tls_options.c ++++ b/src/testcurl/https/test_tls_options.c +@@ -36,7 +36,7 @@ + extern const char srv_key_pem[]; + extern const char srv_self_signed_cert_pem[]; + +-int curl_check_version (const char *req_version, ...); ++int curl_check_version (const char *req_version); + + /** + * test server refuses to negotiate connections with unsupported protocol versions +diff --git a/src/testcurl/https/tls_test_common.h b/src/testcurl/https/tls_test_common.h +index a9af504d..e3f552a8 100644 +--- a/src/testcurl/https/tls_test_common.h ++++ b/src/testcurl/https/tls_test_common.h +@@ -72,7 +72,7 @@ struct CipherDef + + + int +-curl_check_version (const char *req_version, ...); ++curl_check_version (const char *req_version); + + int + curl_tls_is_gnutls (void); + diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild index 98e6e1b1a342..da487b6ff5c8 100644 --- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild +++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild @@ -24,7 +24,8 @@ DEPEND="${RDEPEND} virtual/pkgconfig " -PATCHES=( "${FILESDIR}"/${PN}-0.9.73-test-ssl3.patch ) +PATCHES=( "${FILESDIR}"/${PN}-0.9.73-test-ssl3.patch + "${FILESDIR}"/${PN}-0.9.75-fix-testsuite-with-lto.patch ) S=${WORKDIR}/${MY_P} diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild index 40a1b1ecad61..4985c28c2bdb 100644 --- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild +++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild @@ -12,7 +12,8 @@ HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"; SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" S="${WORKDIR}"/${MY_P} -PATCHES=( "${FILESDIR}"/${PN}-0.9.73-test-ssl3.patch ) +PATCHES=( "${FILESDIR}"/${PN}-0.9.73-test-ssl3.patch + "${FILESDIR}"/${PN}-0.9.75-fix-testsuite-with-lto.patch ) LICENSE="LGPL-2.1+" SLOT="0/12" diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.74.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.74.ebuild index ab61a1435f63..e9712aa82f66 100644 --- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.74.ebuild +++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.74.ebuild @@ -12,6 +12,8 @@ HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"; SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" S="${WORKDIR}"/${MY_P} +PATCHES=( "${FILESDIR}"/${PN}-0.9.75-fix-testsuite-with-lto.patch ) + LICENSE="LGPL-2.1+" SLOT="0/12" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild index 56141caaf078..c8f52e4fc451 100644 --- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild +++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild @@ -12,6 +12,8 @@ HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"; SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" S="${WORKDIR}"/${MY_P} +PATCHES=( "${FILESDIR}"/${P}-fix-testsuite-with-lto.patch ) + LICENSE="LGPL-2.1+" SLOT="0/12" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
