mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-25 18:32:57 +02:00
ntp: Fix FTBFS with glibc 2.34
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
committed by
Peter Müller
parent
b7fca3c49b
commit
9c7de6603f
1
lfs/ntp
1
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 \
|
||||
|
||||
29
src/patches/ntp-4.2.8p15-build-fix-for-glibc-2.34.patch
Normal file
29
src/patches/ntp-4.2.8p15-build-fix-for-glibc-2.34.patch
Normal file
@@ -0,0 +1,29 @@
|
||||
From 082a504cfcc046c3d8adaae1164268bc94e5108a Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@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@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
|
||||
|
||||
Reference in New Issue
Block a user