26cfd0d699
Win daily builds are failing since then. Also Jenkins is failing intermittently so it needs more investigation Revert "New UBSan failure with Firebird 3.0.11" This reverts commit345f8cc9de. Revert "external/firebird: Reinstate UBSan function-type-mismatch fix" This reverts commitd5445a8c47. Revert "mold: fatal: cannot open loader_path/../Debug/firebird" This reverts commitf2ba02eee9. Revert "firebird: set -mmacosx-version-min to 10.15" This reverts commit6998eacf54. Revert "tdf#134526 Firebird: upgrade to release 3.0.11" This reverts commit00eae23267. Change-Id: Id4b0600965953051f6947f570c9b9a1f56044502 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162200 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
41 lines
1.6 KiB
Groff
41 lines
1.6 KiB
Groff
From 8305b41bb262b6e249f2551639fa88392e152287 Mon Sep 17 00:00:00 2001
|
|
From: Stephan Bergmann <sbergman@redhat.com>
|
|
Date: Tue, 7 Sep 2021 08:47:32 +0200
|
|
Subject: [PATCH] extern/cloop: Missing dependencies of compilations on output
|
|
directories
|
|
|
|
When building Firebird 3.0.7 as part of LibreOffice, we noticed occasional build
|
|
failures like <https://ci.libreoffice.org/job/gerrit_linux_clang_dbgutil/96392/>
|
|
|
|
> error: unable to open output file '/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/workdir/UnpackedTarball/firebird/temp/Debug/cloop/release/tests/test1/CTest.o': 'No such file or directory'
|
|
> 1 error generated.
|
|
> Makefile:72: recipe for target '/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/workdir/UnpackedTarball/firebird/temp/Debug/cloop/release/tests/test1/CTest.o' failed
|
|
|
|
and while target "all" depends on target "mkdirs" (which would create all those
|
|
directories) in extern/cloop/Makefile, there is no order among the dependencies
|
|
of "all", so no guarantee that the directories are already created when the
|
|
compilation recipes are executed.
|
|
---
|
|
extern/cloop/Makefile | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/extern/cloop/Makefile b/extern/cloop/Makefile
|
|
index 3fca0c7356..c5a2b52628 100644
|
|
--- a/extern/cloop/Makefile
|
|
+++ b/extern/cloop/Makefile
|
|
@@ -54,10 +54,10 @@ vpath %.c $(SRC_DIRS)
|
|
vpath %.cpp $(SRC_DIRS)
|
|
|
|
define compile
|
|
-$1/%.o: %.c
|
|
+$1/%.o: %.c | $1
|
|
$(CC) -c $$(C_FLAGS) $$< -o $$@
|
|
|
|
-$1/%.o: %.cpp
|
|
+$1/%.o: %.cpp | $1
|
|
$(CXX) -c $$(CXX_FLAGS) $$< -o $$@
|
|
endef
|
|
|
|
--
|
|
2.31.1
|
|
|