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

[Stephan Bergmann]

 external/firebird/UnpackedTarball_firebird.mk |    2 ++
 external/firebird/debug-gfix-failure.patch    |   22 ++++++++++++++++++++++
 external/firebird/macosx-elcapitan-dyld.patch |    6 +++---
 3 files changed, 27 insertions(+), 3 deletions(-)

New commits:
commit 128e7ce3ffa50b11b2d5ff9777a27b095a84e5d7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Aug 25 09:43:10 2016 +0200

    external/firebird: Try track down "Couldn't turn forced writes off" failure
    
    ...that is sporadically observed on tinderboxes.  (Can be reverted once the
    cause is found.)
    
    Change-Id: I74135b3159fe686b7d7da33da569bde6c73b89e2

diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk
index 861b212..b746f1b 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -20,6 +20,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 		external/firebird/firebird-cloop-compiler.patch.1 \
 		external/firebird/firebird-gcc6.patch.1 \
 		external/firebird/wnt-dbgutil.patch \
+		external/firebird/debug-gfix-failure.patch \
+	external/firebird/macosx-elcapitan-dyld.patch \
 ))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
diff --git a/external/firebird/debug-gfix-failure.patch b/external/firebird/debug-gfix-failure.patch
new file mode 100644
index 0000000..8b0c121
--- /dev/null
+++ b/external/firebird/debug-gfix-failure.patch
@@ -0,0 +1,22 @@
+--- examples/empbuild/empbuild.e
++++ examples/empbuild/empbuild.e
+@@ -65,6 +65,7 @@
+  *
+  **************************************/
+ TEXT	cmd [140];
++int status;
+ 
+ if (argc > 1)
+     strcpy (Db_name, argv[1]);
+@@ -95,9 +96,9 @@
+ 
+ printf ("Turning forced writes off\n");
+ sprintf (cmd, "gfix -write async %s", Db_name);
+-if (system (cmd))
++if ((status = system (cmd)))
+     {
+-    printf ("Couldn't turn forced writes off\n");
++    printf ("Couldn't turn forced writes off (%d)\n", status);
+     exit (FINI_ERROR);
+     }
+ 
diff --git a/external/firebird/macosx-elcapitan-dyld.patch b/external/firebird/macosx-elcapitan-dyld.patch
index 134cdd9..d8c0b2b 100644
--- a/external/firebird/macosx-elcapitan-dyld.patch
+++ b/external/firebird/macosx-elcapitan-dyld.patch
@@ -6,9 +6,9 @@
   **************************************/
 -TEXT	cmd [140];
 +TEXT	cmd [8000];
+ int status;
  
  if (argc > 1)
-     strcpy (Db_name, argv[1]);
 @@ -94,7 +94,9 @@
      }
  
@@ -17,9 +17,9 @@
 +if (!lp) lp = "";
 -sprintf (cmd, "gfix -write async %s", Db_name);
 +sprintf (cmd, "DYLD_LIBRARY_PATH=%s gfix -write async %s", lp, Db_name);
- if (system (cmd))
+ if ((status = system (cmd)))
      {
-     printf ("Couldn't turn forced writes off\n");
+     printf ("Couldn't turn forced writes off (%d)\n", status);
 @@ -104,7 +106,7 @@
      }