diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-08-25 09:43:10 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-08-25 09:43:10 +0200 |
| commit | 128e7ce3ffa50b11b2d5ff9777a27b095a84e5d7 (patch) | |
| tree | f3a22e8ad92f275c7735c101b6399428ee2c69ed /external | |
| parent | 5d5f1de548c1086dd3476e40bfe06aa4a5830a6d (diff) | |
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
Diffstat (limited to 'external')
| -rw-r--r-- | external/firebird/UnpackedTarball_firebird.mk | 2 | ||||
| -rw-r--r-- | external/firebird/debug-gfix-failure.patch | 22 | ||||
| -rw-r--r-- | external/firebird/macosx-elcapitan-dyld.patch | 6 |
3 files changed, 27 insertions, 3 deletions
diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk index 861b212dc15d..b746f1bbc19e 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 000000000000..8b0c12185dcc --- /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 134cdd974687..d8c0b2bcc028 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 @@ } |