From ab85233daba06aabebadda800b5355791a86979f Mon Sep 17 00:00:00 2001 From: Joshua Kinard Date: Sun, 4 Aug 2024 18:26:59 -0400 Subject: [PATCH] net-dns/nsd: Fix an autoconf check in simdzone src Added a patch to fix an autoconf check in the simdzone src configure.ac file for Westmere detection that was calling a non-existent C function and breaking the test. Patch submitted to upstream as NLnetLabs/simdzone PR#224. Closes: https://bugs.gentoo.org/937318 Reported-by: Agostino Sarubbo Signed-off-by: Joshua Kinard --- ...4.10.1-simdzone-configure_ac-_mm_popcnt_u64.patch | 12 ++++++++++++ .../{nsd-4.10.1-r1.ebuild => nsd-4.10.1-r2.ebuild} | 1 + 2 files changed, 13 insertions(+) create mode 100644 net-dns/nsd/files/nsd-4.10.1-simdzone-configure_ac-_mm_popcnt_u64.patch rename net-dns/nsd/{nsd-4.10.1-r1.ebuild => nsd-4.10.1-r2.ebuild} (98%) diff --git a/net-dns/nsd/files/nsd-4.10.1-simdzone-configure_ac-_mm_popcnt_u64.patch b/net-dns/nsd/files/nsd-4.10.1-simdzone-configure_ac-_mm_popcnt_u64.patch new file mode 100644 index 0000000000000..5d6a38c64a0d3 --- /dev/null +++ b/net-dns/nsd/files/nsd-4.10.1-simdzone-configure_ac-_mm_popcnt_u64.patch @@ -0,0 +1,12 @@ +diff -Naurp a/simdzone/configure.ac b/simdzone/configure.ac +--- a/simdzone/configure.ac 2024-08-02 08:05:01.000000000 -0400 ++++ b/simdzone/configure.ac 2024-08-04 17:56:15.810347292 -0400 +@@ -76,7 +76,7 @@ AC_INCLUDES_DEFAULT + int main(int argc, char *argv[]) + { + (void)argv; +- uint64_t popcnt = _mm_popcnt_64((uint64_t)argc); ++ uint64_t popcnt = _mm_popcnt_u64((uint64_t)argc); + return popcnt == 11; + } + ]]) diff --git a/net-dns/nsd/nsd-4.10.1-r1.ebuild b/net-dns/nsd/nsd-4.10.1-r2.ebuild similarity index 98% rename from net-dns/nsd/nsd-4.10.1-r1.ebuild rename to net-dns/nsd/nsd-4.10.1-r2.ebuild index 099b81460652c..06ee9f176c221 100644 --- a/net-dns/nsd/nsd-4.10.1-r1.ebuild +++ b/net-dns/nsd/nsd-4.10.1-r2.ebuild @@ -49,6 +49,7 @@ BDEPEND=" " PATCHES=( + "${FILESDIR}/${PN}-4.10.1-simdzone-configure_ac-_mm_popcnt_u64.patch" "${FILESDIR}/${PN}-munin-gentoo-paths.patch" )