From e31860c89a98f71eee2919f95caad66cd210b7b9 Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Thu, 11 Jul 2024 23:06:42 +0200
Subject: [PATCH] fix build e2fsprogs for newer gcc

---
 .../e2fsprogs/0001-fix-gettext-in-e2fsprog.patch | 16 ++++++++++++++++
 make/applications.mk                             | 10 ++++++----
 make/bootstrap.mk                                |  2 +-
 make/ffmpeg.mk                                   |  2 +-
 4 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 archive-patches/e2fsprogs/0001-fix-gettext-in-e2fsprog.patch

diff --git a/archive-patches/e2fsprogs/0001-fix-gettext-in-e2fsprog.patch b/archive-patches/e2fsprogs/0001-fix-gettext-in-e2fsprog.patch
new file mode 100644
index 0000000..da78b44
--- /dev/null
+++ b/archive-patches/e2fsprogs/0001-fix-gettext-in-e2fsprog.patch
@@ -0,0 +1,16 @@
+--- a/configure.in
++++ b/configure.in
+@@ -813,7 +813,12 @@
+ AC_SUBST(PACKAGE)
+ AC_SUBST(VERSION)
+ 
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT_VERSION(0.20)
++AM_GNU_GETTEXT([external])
++USE_INCLUDED_LIBINTL="no"
++AC_SUBST(USE_INCLUDED_LIBINTL)
++BUILD_INCLUDED_LIBINTL="no"
++AC_SUBST(BUILD_INCLUDED_LIBINTL)
+ dnl
+ dnl End of configuration options
+ dnl
diff --git a/make/applications.mk b/make/applications.mk
index 66f79e3..e8f14da 100755
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -109,6 +109,12 @@ $(D)/e2fsprogs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(TARGETPREFIX)
 	$(START_BUILD)
 	$(UNTAR)/e2fsprogs-$(E2FSPROGS_VER).tar.gz
 	set -e; cd $(BUILD_TMP)/e2fsprogs-$(E2FSPROGS_VER); \
+		for i in $(PATCHES)/e2fsprogs/*.patch; do \
+			echo -e "==> $(TERM_RED)Applying Patch:$(TERM_NORMAL) $$i"; \
+			patch -p1 < $$i; \
+		done; \
+		export ac_cv_path_LDCONFIG=""; \
+		autoupdate; \
 		autoreconf -fi; \
 		CFLAGS="-Os" \
 		./configure \
@@ -123,13 +129,9 @@ $(D)/e2fsprogs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(TARGETPREFIX)
 			--disable-profile \
 			--disable-e2initrd-helper \
 			--disable-backtrace \
-			--disable-bmap-stats \
 			--disable-debugfs \
-			--disable-fuse2fs \
 			--disable-imager \
-			--disable-mmp \
 			--disable-rpath \
-			--disable-tdb \
 			--disable-uuidd \
 			--disable-blkid-debug \
 			--disable-jbd-debug \
diff --git a/make/bootstrap.mk b/make/bootstrap.mk
index 9c77cbd..bd0ae72 100755
--- a/make/bootstrap.mk
+++ b/make/bootstrap.mk
@@ -10,7 +10,7 @@ BOOTSTRAP += $(D)/host_pkgconfig
 BOOTSTRAP += $(D)/host_module_init_tools
 BOOTSTRAP += $(D)/host_mtd-utils
 BOOTSTRAP += $(D)/host_mkcramfs
-BOOTSTRAP += $(D)/host_mksquashfs
+#BOOTSTRAP += $(D)/host_mksquashfs
 ifeq ($(BOXTYPE), armbox)
 BOOTSTRAP += $(D)/host_mkimage
 BOOTSTRAP += $(D)/host_resize2fs
diff --git a/make/ffmpeg.mk b/make/ffmpeg.mk
index ffb4fe4..0495f36 100644
--- a/make/ffmpeg.mk
+++ b/make/ffmpeg.mk
@@ -441,7 +441,7 @@ endif
 
 ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1))
 FFMPEG_CONFIGURE += --disable-iconv
-FFMPEG_CONFIGURE += --cpu=armv6 --disable-vfp
+FFMPEG_CONFIGURE += --cpu=armv6 --enable-armv6 --disable-vfp --extra-cflags="-I$(TARGETPREFIX)/include"
 endif
 
 ifeq ($(BOXTYPE), armbox)
-- 
2.39.5