Initial commit
This commit is contained in:
40
package/utils/e2fsprogs/patches/000-relocatable.patch
Normal file
40
package/utils/e2fsprogs/patches/000-relocatable.patch
Normal file
@@ -0,0 +1,40 @@
|
||||
--- a/lib/et/compile_et.sh.in
|
||||
+++ b/lib/et/compile_et.sh.in
|
||||
@@ -2,8 +2,14 @@
|
||||
#
|
||||
#
|
||||
|
||||
-AWK=@AWK@
|
||||
-DIR=@datadir@/et
|
||||
+if test "x$STAGING_DIR" = x ; then
|
||||
+ AWK=@AWK@
|
||||
+ DIR=@datadir@/et
|
||||
+else
|
||||
+ AWK=awk
|
||||
+ DIR="$STAGING_DIR/../hostpkg/share/et"
|
||||
+fi
|
||||
+
|
||||
|
||||
if test "$1" = "--build-tree" ; then
|
||||
shift;
|
||||
--- a/lib/ss/mk_cmds.sh.in
|
||||
+++ b/lib/ss/mk_cmds.sh.in
|
||||
@@ -2,10 +2,16 @@
|
||||
#
|
||||
#
|
||||
|
||||
-DIR=@datadir@/ss
|
||||
-AWK=@AWK@
|
||||
SED=sed
|
||||
|
||||
+if test "x$STAGING_DIR" = x ; then
|
||||
+ DIR=@datadir@/ss
|
||||
+ AWK=@AWK@
|
||||
+else
|
||||
+ DIR="$STAGING_DIR/../hostpkg/share/ss"
|
||||
+ AWK=awk
|
||||
+fi
|
||||
+
|
||||
for as_var in \
|
||||
LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
|
||||
LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
|
||||
13
package/utils/e2fsprogs/patches/001-com_err_version.patch
Normal file
13
package/utils/e2fsprogs/patches/001-com_err_version.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
--- a/lib/et/Makefile.in
|
||||
+++ b/lib/et/Makefile.in
|
||||
@@ -25,8 +25,8 @@ SHARE_FILES= et_c.awk et_h.awk
|
||||
LIBRARY= libcom_err
|
||||
LIBDIR= et
|
||||
|
||||
-ELF_VERSION = 2.1
|
||||
-ELF_SO_VERSION = 2
|
||||
+ELF_VERSION = 0.0
|
||||
+ELF_SO_VERSION = 0
|
||||
ELF_IMAGE = libcom_err
|
||||
ELF_MYDIR = et
|
||||
ELF_INSTALL_DIR = $(root_libdir)
|
||||
@@ -0,0 +1,10 @@
|
||||
--- a/util/subst.c
|
||||
+++ b/util/subst.c
|
||||
@@ -10,6 +10,7 @@
|
||||
#else
|
||||
#define HAVE_SYS_STAT_H
|
||||
#define HAVE_SYS_TIME_H
|
||||
+#define HAVE_SYS_STAT_H
|
||||
#endif
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
@@ -0,0 +1,28 @@
|
||||
From e33ecf1595e390b2657018442c68ae824b3e13b4 Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Tue, 15 Dec 2020 23:58:53 +0100
|
||||
Subject: [PATCH e2fsprogs] build: Add SYSLIBS to e4crypt linking
|
||||
|
||||
The $(SYSLIBS) was missing when linking the e4crypt application. This is
|
||||
available in the e4crypt.profiled variant, so I assume this was just
|
||||
missing in the normal variant and is not left out intentionally.
|
||||
|
||||
This fixes building e2fsprogrs with -fsanitize=undefined in the global
|
||||
CFLAGS nad LDFLAGS.
|
||||
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
---
|
||||
misc/Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/misc/Makefile.in
|
||||
+++ b/misc/Makefile.in
|
||||
@@ -242,7 +242,7 @@ e4defrag: $(E4DEFRAG_OBJS) $(DEPLIBS)
|
||||
e4crypt: $(E4CRYPT_OBJS) $(DEPLIBS) $(DEPSTATIC_LIBUUID)
|
||||
$(E) " LD $@"
|
||||
$(Q) $(CC) $(ALL_LDFLAGS) -o e4crypt $(E4CRYPT_OBJS) \
|
||||
- $(LIBUUID) $(LIBS)
|
||||
+ $(LIBUUID) $(LIBS) $(SYSLIBS)
|
||||
|
||||
e4defrag.profiled: $(E4DEFRAG_OBJS) $(PROFILED_DEPLIBS)
|
||||
$(E) " LD $@"
|
||||
Reference in New Issue
Block a user