diff options
| author | Eric Sandall | 2018-09-13 16:14:41 -0700 |
|---|---|---|
| committer | Eric Sandall | 2018-09-13 16:14:41 -0700 |
| commit | 67d941941d269f0c83c25b4f82da5439a8bc740c (patch) | |
| tree | ef76b33cc812778bfad3bc40d3ed97771b6347f1 /smgl | |
| parent | 66f24af36e86d4f33d43b277e9d409aab599186e (diff) | |
simpleinit-msb: Fix glibc 2.28+
Diffstat (limited to 'smgl')
| -rw-r--r-- | smgl/simpleinit-msb/HISTORY | 4 | ||||
| -rwxr-xr-x | smgl/simpleinit-msb/PRE_BUILD | 2 | ||||
| -rw-r--r-- | smgl/simpleinit-msb/glibc-2.28.patch | 22 |
3 files changed, 28 insertions, 0 deletions
diff --git a/smgl/simpleinit-msb/HISTORY b/smgl/simpleinit-msb/HISTORY index 38307f228d..97b7e38d3e 100644 --- a/smgl/simpleinit-msb/HISTORY +++ b/smgl/simpleinit-msb/HISTORY @@ -1,3 +1,7 @@ +2018-09-13 Eric Sandall <sandalle@sourcemage.org> + * PRE_BUILD: Apply glibc-2.28.patch + * glibc-2.28.patch: Fix glibc 2.28+ + 2016-05-05 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated mirror to ftp.sourcemage.us diff --git a/smgl/simpleinit-msb/PRE_BUILD b/smgl/simpleinit-msb/PRE_BUILD index ef5f755589..27c82ab58a 100755 --- a/smgl/simpleinit-msb/PRE_BUILD +++ b/smgl/simpleinit-msb/PRE_BUILD @@ -10,6 +10,8 @@ patch -p0 < "$SPELL_DIRECTORY/simpleinit-nonls.patch" && patch -p0 < "$SPELL_DIRECTORY/simpleinit-poweroff.patch" && message "${MESSAGE_COLOR}Apply linux 2.6.38+ headers patch...${DEFAULT_COLOR}" && patch -p1 < "$SPELL_DIRECTORY/simpleinit-ftbfs-define-enoictlcmd.patch" && +message "${MESSAGE_COLOR}Applying glibc 2.28 patch...${DEFAULT_COLOR}" && +patch -p1 < "$SPELL_DIRECTORY"/glibc-2.28.patch && if [[ $SIMPLEINIT_STATIC == y ]]; then sedit 's#shutdown: shutdown.o $(LIB)/my_reboot.o $(LIB)/xstrncpy.o#shutdown: shutdown.o $(LIB)/my_reboot.o $(LIB)/xstrncpy.o\n\t$(CC) $(LDFLAGS) -o $@ $^#' login-utils/Makefile && diff --git a/smgl/simpleinit-msb/glibc-2.28.patch b/smgl/simpleinit-msb/glibc-2.28.patch new file mode 100644 index 0000000000..67fe1d3923 --- /dev/null +++ b/smgl/simpleinit-msb/glibc-2.28.patch @@ -0,0 +1,22 @@ +diff -Naur simpleinit-msb-1.3.orig/sysvtools/bootlogd.c simpleinit-msb-1.3/sysvtools/bootlogd.c +--- simpleinit-msb-1.3.orig/sysvtools/bootlogd.c 2018-09-13 16:05:48.825572632 -0700 ++++ simpleinit-msb-1.3/sysvtools/bootlogd.c 2018-09-13 16:12:00.763922763 -0700 +@@ -23,6 +23,7 @@ + * + */ + ++#include <sys/sysmacros.h> + #include <sys/types.h> + #include <sys/time.h> + #include <sys/stat.h> +diff -Naur simpleinit-msb-1.3.orig/sysvtools/mountpoint.c simpleinit-msb-1.3/sysvtools/mountpoint.c +--- simpleinit-msb-1.3.orig/sysvtools/mountpoint.c 2018-09-13 16:05:48.825572632 -0700 ++++ simpleinit-msb-1.3/sysvtools/mountpoint.c 2018-09-13 16:09:28.807822475 -0700 +@@ -14,6 +14,7 @@ + * 2 of the License, or (at your option) any later version. + */ + ++#include <sys/sysmacros.h> + #include <sys/stat.h> + #include <unistd.h> + #include <stdlib.h> |