From c8198f6e0f464c135c24b78928408a38a2d7c35d Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 3 Jun 2024 15:43:58 +0200 Subject: [PATCH] package/ntp: fix build with GCC 14.x Fix pthread_detach() detection that is broken when building with GCC 14.x: checking for pthread_kill... yes checking for pthread_rwlock_destroy with ... yes checking for pthread_detach with ... no configure: error: could not locate pthread_detach() make[1]: *** [package/pkg-generic.mk:273: /home/user/buildroot/bsp-barebox/build/ntp-4.2.8p17/.stamp_configured] Error 1 make: *** [Makefile:82: _all] Error 2 Reference: https://bugs.ntp.org/show_bug.cgi?id=3926 Additionally, refresh patch 0002 to fix the offset of hunk 1. Signed-off-by: Yegor Yefremov Signed-off-by: Yann E. MORIN (cherry picked from commit 40d0797027a610a3afcb8c2703210298a52f60f5) Signed-off-by: Peter Korsgaard --- package/ntp/0002-ntp-syscalls-fallback.patch | 9 ++++--- .../ntp/0003-fix-pthread-detach-check.patch | 26 +++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 package/ntp/0003-fix-pthread-detach-check.patch diff --git a/package/ntp/0002-ntp-syscalls-fallback.patch b/package/ntp/0002-ntp-syscalls-fallback.patch index 535fc93dfd..46704b9d3f 100644 --- a/package/ntp/0002-ntp-syscalls-fallback.patch +++ b/package/ntp/0002-ntp-syscalls-fallback.patch @@ -8,10 +8,11 @@ Signed-off-by: James Knight configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -1523,11 +1523,11 @@ AC_CACHE_CHECK( +Index: ntp-4.2.8p17/configure.ac +=================================================================== +--- ntp-4.2.8p17.orig/configure.ac ++++ ntp-4.2.8p17/configure.ac +@@ -1472,11 +1472,11 @@ AC_CACHE_CHECK( [ntp_cv_var_ntp_syscalls], [ ntp_cv_var_ntp_syscalls=no diff --git a/package/ntp/0003-fix-pthread-detach-check.patch b/package/ntp/0003-fix-pthread-detach-check.patch new file mode 100644 index 0000000000..894b422f2c --- /dev/null +++ b/package/ntp/0003-fix-pthread-detach-check.patch @@ -0,0 +1,26 @@ +fix pthread_detach check + +Upstream: https://bugs.ntp.org/show_bug.cgi?id=3926 + +Signed-off-by: Yegor Yefremov +--- + sntp/m4/openldap-thread-check.m4 | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +Index: ntp-4.2.8p17/sntp/m4/openldap-thread-check.m4 +=================================================================== +--- ntp-4.2.8p17.orig/sntp/m4/openldap-thread-check.m4 ++++ ntp-4.2.8p17/sntp/m4/openldap-thread-check.m4 +@@ -262,10 +262,8 @@ pthread_rwlock_t rwlock; + dnl save the flags + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #include +-#ifndef NULL +-#define NULL (void*)0 +-#endif +-]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no]) ++pthread_t thread; ++]], [[pthread_detach(thread);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no]) + ]) + + if test $ol_cv_func_pthread_detach = no ; then