mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

external/firebird: Try track down "Couldn't turn forced writes off" failure

Browse Source 
...that is sporadically observed on tinderboxes.  (Can be reverted once the
cause is found.)

Change-Id: I74135b3159fe686b7d7da33da569bde6c73b89e2
This commit is contained in:
Stephan Bergmann
2016-08-25 09:43:10 +02:00
parent 5d5f1de548
commit 128e7ce3ff
3 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
external/firebird/UnpackedTarball_firebird.mk vendored
View File

@@ -20,6 +20,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-cloop-compiler.patch.1 \ external/firebird/firebird-cloop-compiler.patch.1 \
external/firebird/firebird-gcc6.patch.1 \ external/firebird/firebird-gcc6.patch.1 \
external/firebird/wnt-dbgutil.patch \ external/firebird/wnt-dbgutil.patch \
external/firebird/debug-gfix-failure.patch \
external/firebird/macosx-elcapitan-dyld.patch \
)) ))
ifeq ($(OS)-$(COM),WNT-MSC) ifeq ($(OS)-$(COM),WNT-MSC)

22
external/firebird/debug-gfix-failure.patch vendored Normal file
View File

@@ -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);
}

6
external/firebird/macosx-elcapitan-dyld.patch vendored
View File

@@ -6,9 +6,9 @@
**************************************/ **************************************/
-TEXT cmd [140]; -TEXT cmd [140];
+TEXT cmd [8000]; +TEXT cmd [8000];
int status;
if (argc > 1) if (argc > 1)
strcpy (Db_name, argv[1]);
@@ -94,7 +94,9 @@ @@ -94,7 +94,9 @@
} }
@@ -17,9 +17,9 @@
+if (!lp) lp = ""; +if (!lp) lp = "";
-sprintf (cmd, "gfix -write async %s", Db_name); -sprintf (cmd, "gfix -write async %s", Db_name);
+sprintf (cmd, "DYLD_LIBRARY_PATH=%s gfix -write async %s", lp, 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 @@ @@ -104,7 +106,7 @@
} }