diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-09-07 08:33:45 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-09-30 11:01:49 +0200 |
| commit | 5145385c21f3fe3a13878271d5fed6a1fac39bc4 (patch) | |
| tree | 28b735fd854add036cb8c18264059c9f845328f9 /external | |
| parent | cf156d6417f67acae70aa5e2ef5626ad163e814f (diff) | |
exernal/firebird: extern/cloop: Missing dependencies of compilations on...
...output directories
Change-Id: Iaa2b750a12e3df078b46e5bb4feeafc926e11165
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121741
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122042
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 | 41 | ||||
| -rw-r--r-- | external/firebird/UnpackedTarball_firebird.mk | 1 |
2 files changed, 42 insertions, 0 deletions
diff --git a/external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 b/external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 new file mode 100644 index 000000000000..a59e70e06abc --- /dev/null +++ b/external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 @@ -0,0 +1,41 @@ +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 + diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk index 196895ff757c..d8afb02b5012 100644 --- a/external/firebird/UnpackedTarball_firebird.mk +++ b/external/firebird/UnpackedTarball_firebird.mk @@ -39,6 +39,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\ external/firebird/0001-Fix-warning-on-Win64-build-231.patch.1 \ external/firebird/macos-arm64.patch.0 \ external/firebird/firebird-btyacc-add-explicit-rule.patch \ + external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 \ )) ifeq ($(OS),WNT) |