webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

sysvinit: Fix build against glibc 2.36

Browse Source 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2022-08-15 17:17:39 +00:00
committed by Peter Müller
parent 608b536e78
commit 11bea269b0
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lfs/sysvinit
View File

@@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Newer C libraries omit this include from sys/types.h.
# https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/sysvinit-2.98_build_mountpoint.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch
cd $(DIR_APP) && sed -i src/mountpoint.c src/bootlogd.c \
-e "/include.*sys\/stat.h/a#include <sys/sysmacros.h>\n"
cd $(DIR_APP) && sed -e "s/libcrypt.a/libcrypt.so/g" -i src/Makefile

10
src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch Normal file
View File

@@ -0,0 +1,10 @@
--- sysvinit-3.00/src/sulogin.c~ 2022-08-09 09:43:41.993484098 +0000
+++ sysvinit-3.00/src/sulogin.c 2022-08-09 09:45:04.897252500 +0000
@@ -51,7 +51,6 @@
#ifdef __linux__
# include <sys/statfs.h>
# include <sys/mount.h>
-# include <linux/fs.h>
# include <linux/magic.h>
# include <linux/major.h>
# ifndef TMPFS_MAGIC