From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 08/28] ntp: Fix FTBFS with glibc 2.34
Date: Fri, 04 Feb 2022 16:47:28 +0000 [thread overview]
Message-ID: <20220204164748.315559-8-michael.tremer@ipfire.org> (raw)
In-Reply-To: <20220204164748.315559-1-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 2190 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/ntp | 1 +
...tp-4.2.8p15-build-fix-for-glibc-2.34.patch | 29 +++++++++++++++++++
2 files changed, 30 insertions(+)
create mode 100644 src/patches/ntp-4.2.8p15-build-fix-for-glibc-2.34.patch
diff --git a/lfs/ntp b/lfs/ntp
index ca46e5163..e039d7bdd 100644
--- a/lfs/ntp
+++ b/lfs/ntp
@@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ntp-4.2.8p15-build-fix-for-glibc-2.34.patch
$(UPDATE_AUTOMAKE)
cd $(DIR_APP) && \
./configure \
diff --git a/src/patches/ntp-4.2.8p15-build-fix-for-glibc-2.34.patch b/src/patches/ntp-4.2.8p15-build-fix-for-glibc-2.34.patch
new file mode 100644
index 000000000..442fe7828
--- /dev/null
+++ b/src/patches/ntp-4.2.8p15-build-fix-for-glibc-2.34.patch
@@ -0,0 +1,29 @@
+From 082a504cfcc046c3d8adaae1164268bc94e5108a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem(a)gmail.com>
+Date: Sat, 31 Jul 2021 10:51:41 -0700
+Subject: [PATCH] libntp: Do not use PTHREAD_STACK_MIN on glibc
+In glibc 2.34+ PTHREAD_STACK_MIN is not a compile-time constant which
+could mean different stack sizes at runtime on different architectures
+and it also causes compile failure. Default glibc thread stack size
+or 64Kb set by ntp should be good in glibc these days.
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem(a)gmail.com>
+---
+ libntp/work_thread.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/libntp/work_thread.c b/libntp/work_thread.c
+index 03a5647..3ddd751 100644
+--- a/libntp/work_thread.c
++++ b/libntp/work_thread.c
+@@ -41,7 +41,7 @@
+ #ifndef THREAD_MINSTACKSIZE
+ # define THREAD_MINSTACKSIZE (64U * 1024)
+ #endif
+-#ifndef __sun
++#if !defined(__sun) && !defined(__GLIBC__)
+ #if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN
+ # undef THREAD_MINSTACKSIZE
+ # define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN
+--
+2.32.0
+
--
2.30.2
next prev parent reply other threads:[~2022-02-04 16:47 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-04 16:47 [PATCH 01/28] gcc: toolchain stage 2: Set sysroot to /tools_${arch} Michael Tremer
2022-02-04 16:47 ` [PATCH 02/28] glibc: Update to version 2.34 Michael Tremer
2022-02-14 21:34 ` Adolf Belka
2022-02-04 16:47 ` [PATCH 03/28] glibc: Enable CET Michael Tremer
2022-02-04 16:47 ` [PATCH 04/28] glibc: Enable memory tagging on aarch64 Michael Tremer
2022-02-04 16:47 ` [PATCH 05/28] binutils+gcc: Fix that the toolchain compiler is trying to link against host libraries Michael Tremer
2022-02-04 16:47 ` [PATCH 06/28] make.sh: Build zstd after second pass of GCC Michael Tremer
2022-02-04 16:47 ` [PATCH 07/28] texinfo: Fix FTBFS with glibc-2.34 Michael Tremer
2022-02-04 16:47 ` Michael Tremer [this message]
2022-02-04 16:47 ` [PATCH 09/28] postfix: Fix FTBFS with glibc 2.34 Michael Tremer
2022-02-04 16:47 ` [PATCH 10/28] libnfsidmap: Drop package Michael Tremer
2022-02-14 21:36 ` Adolf Belka
2022-02-04 16:47 ` [PATCH 11/28] binutils: Update to 2.37 Michael Tremer
2022-02-14 21:36 ` Adolf Belka
2022-02-04 16:47 ` [PATCH 12/28] make.sh: Make BUILDTARGET consistent for all architectures Michael Tremer
2022-02-04 16:47 ` [PATCH 13/28] make.sh: Bump toolchain version Michael Tremer
2022-02-04 16:47 ` [PATCH 14/28] flash-images: Increase size of root partition to 1800 MB Michael Tremer
2022-02-04 16:47 ` [PATCH 15/28] binutils/gcc: Explicitely declare host and build architecture tuple Michael Tremer
2022-02-04 16:47 ` [PATCH 16/28] hyperscan: Enable release build and disable examples Michael Tremer
2022-02-04 16:47 ` [PATCH 17/28] pciutils: Do not make headers executable Michael Tremer
2022-02-14 21:37 ` Adolf Belka
2022-02-04 16:47 ` [PATCH 18/28] make.sh: Refactor stripper Michael Tremer
2022-02-04 16:47 ` [PATCH 19/28] make.sh: Include /tools/sbin in search path Michael Tremer
2022-02-04 16:47 ` [PATCH 20/28] expect: Update automake to fix build on aarch64 Michael Tremer
2022-02-04 16:47 ` [PATCH 21/28] make.sh: Bump toolchain date Michael Tremer
2022-02-04 16:47 ` [PATCH 22/28] stripper: Actually use the path we want Michael Tremer
2022-02-04 16:47 ` [PATCH 23/28] make.sh: Add CUSTOM_PATH option to lfsmake1 Michael Tremer
2022-02-04 16:47 ` [PATCH 24/28] make.sh: Set correct PATH in stage1 Michael Tremer
2022-02-04 16:47 ` [PATCH 25/28] Config: Globally permit using 32 bit time_t Michael Tremer
2022-02-04 16:47 ` [PATCH 26/28] strip: Dereference path if it is a symlink Michael Tremer
2022-02-04 16:47 ` [PATCH 27/28] glibc: Update to 2.35 Michael Tremer
2022-02-04 16:47 ` [PATCH 28/28] make.sh: Bump toolchain version Michael Tremer
2022-02-05 18:13 ` [PATCH 01/28] gcc: toolchain stage 2: Set sysroot to /tools_${arch} Peter Müller
2022-02-06 10:39 ` Peter Müller
2022-02-07 10:15 ` Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220204164748.315559-8-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox