[Buildroot] [PATCH] package/frotz: Add a missing dependency to the Makefile to fix build problems

[Buildroot] [PATCH] package/frotz: Add a missing dependency to the Makefile to fix build problems

[Thomas Huth]

There are currently some build jobs failing where blorblib is built before
hash.h has been created. This patch should hopefully fix these issues.

Signed-off-by: Thomas Huth <huth@tuxfamily.org>
---
 See e.g. here for a failed build:
 http://autobuild.buildroot.net/results/9cd213ce2d36f797041c7b21044c2b2c223dd546/build-end.log

 ...0001-Makefile-blorb-lib-needs-hash.h.patch | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 package/frotz/0001-Makefile-blorb-lib-needs-hash.h.patch

diff --git a/package/frotz/0001-Makefile-blorb-lib-needs-hash.h.patch b/package/frotz/0001-Makefile-blorb-lib-needs-hash.h.patch
new file mode 100644
index 0000000000..3bde10b6ba
--- /dev/null
+++ b/package/frotz/0001-Makefile-blorb-lib-needs-hash.h.patch
@@ -0,0 +1,40 @@
+From cdf0ad4aff2d8937034e02e41a5aadcca320ea18 Mon Sep 17 00:00:00 2001
+From: Thomas Huth <huth@tuxfamily.org>
+Date: Fri, 14 Oct 2022 20:29:41 +0200
+Subject: [PATCH] Makefile: blorb-lib needs hash.h
+
+If running "make blorb-lib" on a vanilla source directory, the
+compilation fails with:
+
+ make -C src/blorb
+ make[1]: Entering directory '/home/thomas/src/frotz/src/blorb'
+ cc -Wall -std=c99 -O3  -g -D_POSIX_C_SOURCE=200809L -I../common -fPIC
+  -fpic -o blorblib.o -c blorblib.c
+ In file included from blorblib.c:11:
+ ../common/frotz.h:74:10: fatal error: hash.h: No such file or directory
+    74 | #include "hash.h"
+       |          ^~~~~~~~
+ compilation terminated.
+
+Looks like we also have to make sure that hash.h is in place before
+compiling the blorb target, thus add the dependency to the Makefile.
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 1d27b09..3d2bc45 100644
+--- a/Makefile
++++ b/Makefile
+@@ -461,7 +461,7 @@ $(SDL_LIB): $(COMMON_DEFINES) $(HASH) $(SDL_DIR)
+ $(DUMB_LIB): $(COMMON_DEFINES) $(HASH)
+ 	$(MAKE) -C $(DUMB_DIR)
+ 
+-$(BLORB_LIB): $(COMMON_DEFINES)
++$(BLORB_LIB): $(COMMON_DEFINES) $(HASH)
+ 	$(MAKE) -C $(BLORB_DIR)
+ 
+ $(SUB_CLEAN):
+-- 
+2.37.3
+
-- 
2.37.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/frotz: Add a missing dependency to the Makefile to fix build problems

[Thomas Petazzoni via buildroot]

Hello Thomas,

On Sat, 15 Oct 2022 08:04:11 +0200
Thomas Huth <huth@tuxfamily.org> wrote:

> There are currently some build jobs failing where blorblib is built before
> hash.h has been created. This patch should hopefully fix these issues.
> 
> Signed-off-by: Thomas Huth <huth@tuxfamily.org>
> ---
>  See e.g. here for a failed build:
>  http://autobuild.buildroot.net/results/9cd213ce2d36f797041c7b21044c2b2c223dd546/build-end.log

I believe this kind of issue dates back from when James was testing
with --shuffle=random. So I tried to reproduce locally by doing several
builds of frotz with "make --shuffle=random", and I was not able to
reproduce. I'm not really keen on adding a patch that "hopefully fix
these issues", without being able to reproduce them and confidently say
that the patch fixes the issue.

So for now, I've marked the patch as Rejected, but we can always
revisit that if we get a way of reproducing the issue, and therefore
confirming that the problem no longer occurs thanks to the patch.

Thanks,

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/frotz: Add a missing dependency to the Makefile to fix build problems

[Thomas Huth]

Am Mon, 10 Jul 2023 23:27:09 +0200
schrieb Thomas Petazzoni <thomas.petazzoni@bootlin.com>:

> Hello Thomas,
> 
> On Sat, 15 Oct 2022 08:04:11 +0200
> Thomas Huth <huth@tuxfamily.org> wrote:
> 
> > There are currently some build jobs failing where blorblib is built before
> > hash.h has been created. This patch should hopefully fix these issues.
> > 
> > Signed-off-by: Thomas Huth <huth@tuxfamily.org>
> > ---
> >  See e.g. here for a failed build:
> >  http://autobuild.buildroot.net/results/9cd213ce2d36f797041c7b21044c2b2c223dd546/build-end.log  
> 
> I believe this kind of issue dates back from when James was testing
> with --shuffle=random.

Yes, I think that's right. The problem went away automatically after a
while, I guess that happened when the shuffle had been disabled again.

> So I tried to reproduce locally by doing several
> builds of frotz with "make --shuffle=random", and I was not able to
> reproduce. I'm not really keen on adding a patch that "hopefully fix
> these issues", without being able to reproduce them and confidently say
> that the patch fixes the issue.
> 
> So for now, I've marked the patch as Rejected, but we can always
> revisit that if we get a way of reproducing the issue, and therefore
> confirming that the problem no longer occurs thanks to the patch.

That's fine, I was able to get the patch accepted upstream (with a
different commit message):

 https://gitlab.com/DavidGriffith/frotz/-/commit/cdf0ad4aff2d8937034e02e41a5aadcca320ea18

... so it will be included anyway when we update the package to the next
version.

 Thomas
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot