From bf7e29071630cdafb37e4c620be438e26845575e Mon Sep 17 00:00:00 2001 From: Markham Date: Thu, 8 Aug 2024 19:17:32 +0200 Subject: [PATCH] fix ofgrwite build with gcc14.2 --- .../e2fsprogs/0001-fix-gettext-in-e2fsprog.patch | 6 +++--- ...4.6.1-neutrino.patch => 0001-4.6.1-neutrino.patch} | 0 archive-patches/ofgwrite/0002-fix-implicit-int.patch | 11 +++++++++++ make/ofgwrite.mk | 4 +++- 4 files changed, 17 insertions(+), 4 deletions(-) rename archive-patches/ofgwrite/{ofg-4.6.1-neutrino.patch => 0001-4.6.1-neutrino.patch} (100%) create mode 100644 archive-patches/ofgwrite/0002-fix-implicit-int.patch diff --git a/archive-patches/e2fsprogs/0001-fix-gettext-in-e2fsprog.patch b/archive-patches/e2fsprogs/0001-fix-gettext-in-e2fsprog.patch index da78b44..c57953a 100644 --- a/archive-patches/e2fsprogs/0001-fix-gettext-in-e2fsprog.patch +++ b/archive-patches/e2fsprogs/0001-fix-gettext-in-e2fsprog.patch @@ -1,6 +1,6 @@ ---- a/configure.in -+++ b/configure.in -@@ -813,7 +813,12 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -872,7 +872,12 @@ AC_SUBST(PACKAGE) AC_SUBST(VERSION) diff --git a/archive-patches/ofgwrite/ofg-4.6.1-neutrino.patch b/archive-patches/ofgwrite/0001-4.6.1-neutrino.patch similarity index 100% rename from archive-patches/ofgwrite/ofg-4.6.1-neutrino.patch rename to archive-patches/ofgwrite/0001-4.6.1-neutrino.patch diff --git a/archive-patches/ofgwrite/0002-fix-implicit-int.patch b/archive-patches/ofgwrite/0002-fix-implicit-int.patch new file mode 100644 index 0000000..d75f557 --- /dev/null +++ b/archive-patches/ofgwrite/0002-fix-implicit-int.patch @@ -0,0 +1,11 @@ +--- a/flash_ext4.c ++++ b/flash_ext4.c +@@ -172,7 +172,7 @@ int flash_unpack_rootfs(char* filename, int quiet, int no_write) + } + + #define BUF_SIZE 1024 +-copy_file(char *from, char *to) ++int copy_file(char *from, char *to) + { + int inputFd, outputFd, openFlags; + mode_t filePerms; diff --git a/make/ofgwrite.mk b/make/ofgwrite.mk index a120cf9..71714db 100644 --- a/make/ofgwrite.mk +++ b/make/ofgwrite.mk @@ -5,7 +5,8 @@ OFGWRITE_VERSION = git OFGWRITE_SOURCE = ofgwrite-max.$(OFGWRITE_VERSION) OFGWRITE_SITE = https://github.com/MaxWiesel/$(OFGWRITE_SOURCE) -OFGWRITE_PATCH = ofg-4.6.1-neutrino.patch +OFGWRITE_PATCH = 0001-4.6.1-neutrino.patch +OFGWRITE_PATCH += 0002-fix-implicit-int.patch $(ARCHIVE)/$(OFGWRITE_SOURCE).tar.bz2: get-git-archive.sh $(OFGWRITE_SITE) master $(notdir $@) $(ARCHIVE) @@ -18,6 +19,7 @@ $(D)/ofgwrite: $(ARCHIVE)/$(OFGWRITE_SOURCE).tar.bz2 | $(TARGETREFIX) $(call apply_patches, $(addprefix ofgwrite/, $(OFGWRITE_PATCH))); \ export CC=$(TARGET)-gcc && \ export AR=$(TARGET)-ar && \ + export CFLAGS="-Wno-implicit-function-declaration"; \ $(BUILDENV); \ $(MAKE) $(TARGET)-strip $(BUILD_TMP)/$(OFGWRITE_SOURCE)/ofgwrite_bin -- 2.39.5