* [PR PATCH] ntp: fix build with glibc 2.34
@ 2022-08-19 3:06 oreo639
2022-08-19 18:12 ` [PR PATCH] [Updated] " oreo639
2022-08-20 7:25 ` [PR PATCH] [Merged]: " classabbyamp
0 siblings, 2 replies; 3+ messages in thread
From: oreo639 @ 2022-08-19 3:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1287 bytes --]
There is a new pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages ntp
https://github.com/void-linux/void-packages/pull/38772
ntp: fix build with glibc 2.34
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
https://bugs.ntp.org/show_bug.cgi?id=3741
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38772.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ntp-38772.patch --]
[-- Type: text/x-diff, Size: 2488 bytes --]
From 83ef748f4a26672b8d695892fb1dab4119392c7c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 18 Aug 2022 20:05:03 -0700
Subject: [PATCH] ntp: fix build with glibc 2.34
https://bugs.ntp.org/show_bug.cgi?id=3741
---
srcpkgs/ntp/patches/compat-glibc-2.34.patch | 55 +++++++++++++++++++++
1 file changed, 55 insertions(+)
create mode 100644 srcpkgs/ntp/patches/compat-glibc-2.34.patch
diff --git a/srcpkgs/ntp/patches/compat-glibc-2.34.patch b/srcpkgs/ntp/patches/compat-glibc-2.34.patch
new file mode 100644
index 000000000000..4e75cc845282
--- /dev/null
+++ b/srcpkgs/ntp/patches/compat-glibc-2.34.patch
@@ -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)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] ntp: fix build with glibc 2.34
2022-08-19 3:06 [PR PATCH] ntp: fix build with glibc 2.34 oreo639
@ 2022-08-19 18:12 ` oreo639
2022-08-20 7:25 ` [PR PATCH] [Merged]: " classabbyamp
1 sibling, 0 replies; 3+ messages in thread
From: oreo639 @ 2022-08-19 18:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1292 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages ntp
https://github.com/void-linux/void-packages/pull/38772
ntp: fix build with glibc 2.34
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
https://bugs.ntp.org/show_bug.cgi?id=3741
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38772.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ntp-38772.patch --]
[-- Type: text/x-diff, Size: 2487 bytes --]
From a0a6ae80012a50e228a885466a9f1b9af5f71830 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 18 Aug 2022 20:05:03 -0700
Subject: [PATCH] ntp: fix build for glibc 2.34
https://bugs.ntp.org/show_bug.cgi?id=3741
---
srcpkgs/ntp/patches/compat-glibc-2.34.patch | 55 +++++++++++++++++++++
1 file changed, 55 insertions(+)
create mode 100644 srcpkgs/ntp/patches/compat-glibc-2.34.patch
diff --git a/srcpkgs/ntp/patches/compat-glibc-2.34.patch b/srcpkgs/ntp/patches/compat-glibc-2.34.patch
new file mode 100644
index 000000000000..4e75cc845282
--- /dev/null
+++ b/srcpkgs/ntp/patches/compat-glibc-2.34.patch
@@ -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)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: ntp: fix build with glibc 2.34
2022-08-19 3:06 [PR PATCH] ntp: fix build with glibc 2.34 oreo639
2022-08-19 18:12 ` [PR PATCH] [Updated] " oreo639
@ 2022-08-20 7:25 ` classabbyamp
1 sibling, 0 replies; 3+ messages in thread
From: classabbyamp @ 2022-08-20 7:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1140 bytes --]
There's a merged pull request on the void-packages repository
ntp: fix build with glibc 2.34
https://github.com/void-linux/void-packages/pull/38772
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
https://bugs.ntp.org/show_bug.cgi?id=3741
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-08-20 7:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-19 3:06 [PR PATCH] ntp: fix build with glibc 2.34 oreo639
2022-08-19 18:12 ` [PR PATCH] [Updated] " oreo639
2022-08-20 7:25 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).