fix build e2fsprogs for newer gcc

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 (file)
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 66f79e3c74bf2966b66b805b89365baebb1e22e4..e8f14dab10b070bb464387726ae388b0725f498b 100755 (executable)
--- 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 9c77cbd835ebdadc003f83fb09d7f7fe142e43a9..bd0ae723cb072c1c1ae6ab3e305d3736b7ec1378 100755 (executable)
--- 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 ffb4fe47044adf6e2437a04753a649cf95f180a7..0495f3640ba91847b8c514e58963f5ffcda60930 100644 (file)
--- 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)