u_boot_tools: fix gcc2 build

haikuports · Apr 17, 2021 · 04e0a44 · 04e0a44 · X547 · Apr 19, 2021
1 parent 63c4766
commit 04e0a44
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/dev-embedded/u_boot_tools/patches/u_boot_tools-2012.10.patchset b/dev-embedded/u_boot_tools/patches/u_boot_tools-2012.10.patchset
@@ -1,4 +1,4 @@
-From 07cf4d7799b3c89ccc39b6ede13d661617738b5d Mon Sep 17 00:00:00 2001
+From 91c785dfa81a719c3c1cb065df21befe72272276 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Sun, 21 Sep 2014 10:40:38 +0200
 Subject: Avoid include name conflict with Haiku.
@@ -188,5 +188,28 @@ index d6b4017..8387b3d 100644
   * Supported commands for configuration file
   */
 -- 
-1.8.3.4
+2.30.2
+
+
+From 869c268da0e8fb20a0f8b2630a2d7591828c1bb2 Mon Sep 17 00:00:00 2001
+From: Sergei Reznikov <diver@gelios.net>
+Date: Sat, 17 Apr 2021 13:34:38 +0300
+Subject: Fix gcc2 build
+
+
+diff --git a/Makefile b/Makefile
+index 09456e0..de4e315 100644
+--- a/Makefile
++++ b/Makefile
+@@ -621,7 +621,7 @@ $(obj)include/autoconf.mk.dep: $(obj)include/config.h include/common.h
+ 	set -e ; \
+ 	: Generate the dependancies ; \
+ 	$(CC) -x c -DDO_DEPS_ONLY -M $(CFLAGS) $(CPPFLAGS) \
+-		-MQ $(obj)include/autoconf.mk include/common.h > $@
++		 $(obj)include/autoconf.mk include/common.h > $@
+
+ $(obj)include/autoconf.mk: $(obj)include/config.h
+ 	@$(XECHO) Generating $@ ; \
+-- 
+2.30.2
 
diff --git a/dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe b/dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe
@@ -4,7 +4,7 @@ of U-Boot images in various formats."
 HOMEPAGE="https://www.denx.de/wiki/U-Boot/Documentation/"
 COPYRIGHT="2003 - 2012 U-Boot"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="http://ftp.denx.de/pub/u-boot/u-boot-2012.10.tar.bz2"
 CHECKSUM_SHA256="dddec75070b5faa5df463085e3e1d27c6d058ec3481c666917baa961956d4d17"
 SOURCE_DIR="u-boot-$portVersion"