Kaydet (Commit) c8bdf901 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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

This reverts commit 128e7ce3 (plus
40b44f7e "Remove line again that was committed
in error" follow-up), now that the cause is found and addressed with
592f4f6a "external/firebird: Backport fix for
CORE-5452 causing spurious SEGV".

Change-Id: I84ddc90707693c2577ad0cd913e987bc9e173e34
Reviewed-on: https://gerrit.libreoffice.org/33229Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
Tested-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst cbc0b5e1
......@@ -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 \
......
--- 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,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 @@
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment