diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-17 18:13:19 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-01-18 07:41:04 +0000 |
| commit | c8bdf901efd034f24bacf5e2d617a00bb1692238 (patch) | |
| tree | c01cae34629c73302807370b9130173efa9c69a0 /external | |
| parent | cbc0b5e1f322418f190c1faa056be87f762d4f4b (diff) | |
Revert "external/firebird: Try track down "Couldn't turn forced writes off" failure"
This reverts commit 128e7ce3ffa50b11b2d5ff9777a27b095a84e5d7 (plus
40b44f7eb25114e5e4e19e571b8781580a938ca6 "Remove line again that was committed
in error" follow-up), now that the cause is found and addressed with
592f4f6a5941e42e6b2b3fa76e74b8ad509724c9 "external/firebird: Backport fix for
CORE-5452 causing spurious SEGV".
Change-Id: I84ddc90707693c2577ad0cd913e987bc9e173e34
Reviewed-on: https://gerrit.libreoffice.org/33229
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/firebird/UnpackedTarball_firebird.mk | 1 | ||||
| -rw-r--r-- | external/firebird/debug-gfix-failure.patch | 22 | ||||
| -rw-r--r-- | external/firebird/macosx-elcapitan-dyld.patch | 6 |
3 files changed, 3 insertions, 26 deletions
diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk index d62bad7b10f3..e30048d4e69b 100644 --- a/external/firebird/UnpackedTarball_firebird.mk +++ b/external/firebird/UnpackedTarball_firebird.mk @@ -20,7 +20,6 @@ $(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/libc++.patch \ external/firebird/0001-Avoid-hangup-in-SS-when-error-happens-at-system-atta.patch.1 \ external/firebird/0002-Backported-fix-for-CORE-5452-Segfault-when-engine-s-.patch.1 \ diff --git a/external/firebird/debug-gfix-failure.patch b/external/firebird/debug-gfix-failure.patch deleted file mode 100644 index 8b0c12185dcc..000000000000 --- a/external/firebird/debug-gfix-failure.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 d8c0b2bcc028..134cdd974687 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 ((status = system (cmd))) + if (system (cmd)) { - printf ("Couldn't turn forced writes off (%d)\n", status); + printf ("Couldn't turn forced writes off\n"); @@ -104,7 +106,7 @@ } |