[Libreoffice-commits] core.git: external/firebird

[Stephan Bergmann (via logerrit)]

 external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 |   41 ++++++++++
 external/firebird/UnpackedTarball_firebird.mk                                       |    6 +
 external/firebird/firebird-cygwin-msvc-warnings.patch                               |    8 -
 3 files changed, 50 insertions(+), 5 deletions(-)

New commits:
commit 6593ebcc01a097e865a0fdc59b65604ae9cd5032
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Sep 7 08:33:45 2021 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Sep 7 13:19:16 2021 +0200

    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 at redhat.com>

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 at 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 64052570fb2b..cc84b5f139e7 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -26,7 +26,10 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,firebird,\
 #   code",
 # * external/firebird/0001-extern-cloop-Missing-dependency-of-BIN_DIR-cloop-on-.patch.1 is upstream
 #   at <https://github.com/FirebirdSQL/firebird/pull/302> "extern/cloop: Missing dependency of
-#   $(BIN_DIR)/cloop on $(BIN_DIR)":
+#   $(BIN_DIR)/cloop on $(BIN_DIR)",
+# * external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 is upstream
+#   at <https://github.com/FirebirdSQL/firebird/pull/6948> "extern/cloop: Missing dependencies of
+#   compilations on output directories":
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
         external/firebird/firebird.disable-ib-util-not-found.patch.1 \
 		external/firebird/firebird-Engine12.patch \
@@ -45,6 +48,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
     external/firebird/0001-extern-cloop-Missing-dependency-of-BIN_DIR-cloop-on-.patch.1 \
     external/firebird/msvc.patch \
     external/firebird/wnt-per-process-trace-storage.patch.1 \
+    external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/firebird/firebird-cygwin-msvc-warnings.patch b/external/firebird/firebird-cygwin-msvc-warnings.patch
index b40f94750fa9..942522439bac 100644
--- a/external/firebird/firebird-cygwin-msvc-warnings.patch
+++ b/external/firebird/firebird-cygwin-msvc-warnings.patch
@@ -180,12 +180,12 @@ diff -ur builds/posix/make.rules builds/posix/make.rules
  vpath %.cpp $(SRC_DIRS)
  
  define compile
--$1/%.o: %.c
-+$1/%.obj: %.c
+-$1/%.o: %.c | $1
++$1/%.obj: %.c | $1
  	$(CC) -c $$(C_FLAGS) $$< -o $$@
  
--$1/%.o: %.cpp
-+$1/%.obj: %.cpp
+-$1/%.o: %.cpp | $1
++$1/%.obj: %.cpp | $1
  	$(CXX) -c $$(CXX_FLAGS) $$< -o $$@
  endef