Skip to content

ntp: fix build with glibc 2.34 #38772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
classabbyamp merged 1 commit into from
Aug 20, 2022
Merged

ntp: fix build with glibc 2.34 #38772

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions srcpkgs/ntp/patches/compat-glibc-2.34.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
diff -Nru a/libntp/work_thread.c b/libntp/work_thread.c
--- a/libntp/work_thread.c 2022-01-16 11:35:17.290791372 +0100
+++ b/libntp/work_thread.c 2022-01-16 11:35:17.290791372 +0100
@@ -41,20 +41,10 @@
#ifndef THREAD_MINSTACKSIZE
# define THREAD_MINSTACKSIZE (64U * 1024)
#endif
-#ifndef __sun
-#if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN
-# undef THREAD_MINSTACKSIZE
-# define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN
-#endif
-#endif

#ifndef THREAD_MAXSTACKSIZE
# define THREAD_MAXSTACKSIZE (256U * 1024)
#endif
-#if THREAD_MAXSTACKSIZE < THREAD_MINSTACKSIZE
-# undef THREAD_MAXSTACKSIZE
-# define THREAD_MAXSTACKSIZE THREAD_MINSTACKSIZE
-#endif

/* need a good integer to store a pointer... */
#ifndef UINTPTR_T
@@ -594,12 +584,25 @@
"start_blocking_thread: pthread_attr_getstacksize() -> %s",
strerror(rc));
} else {
- if (ostacksize < THREAD_MINSTACKSIZE)
- nstacksize = THREAD_MINSTACKSIZE;
- else if (ostacksize > THREAD_MAXSTACKSIZE)
+ nstacksize = ostacksize;
+ /* order is important here: first clamp on upper limit,
+ * and the PTHREAD min stack size is ultimate override!
+ */
+ if (nstacksize > THREAD_MAXSTACKSIZE)
nstacksize = THREAD_MAXSTACKSIZE;
- else
- nstacksize = ostacksize;
+# ifdef PTHREAD_STACK_MAX
+ if (nstacksize > PTHREAD_STACK_MAX)
+ nstacksize = PTHREAD_STACK_MAX;
+# endif
+
+ /* now clamp on lower stack limit. */
+ if (nstacksize < THREAD_MINSTACKSIZE)
+ nstacksize = THREAD_MINSTACKSIZE;
+# ifdef PTHREAD_STACK_MIN
+ if (nstacksize < PTHREAD_STACK_MIN)
+ nstacksize = PTHREAD_STACK_MIN;
+# endif
+
if (nstacksize != ostacksize)
rc = pthread_attr_setstacksize(&thr_attr, nstacksize);
if (0 != rc)