c8bdf901ef
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>
59 lines
1.6 KiB
Diff
59 lines
1.6 KiB
Diff
--- examples/empbuild/empbuild.e
|
|
+++ examples/empbuild/empbuild.e
|
|
@@ -64,7 +64,7 @@
|
|
* Functional description
|
|
*
|
|
**************************************/
|
|
-TEXT cmd [140];
|
|
+TEXT cmd [8000];
|
|
|
|
if (argc > 1)
|
|
strcpy (Db_name, argv[1]);
|
|
@@ -94,7 +94,9 @@
|
|
}
|
|
|
|
printf ("Turning forced writes off\n");
|
|
+char const * lp = getenv("DYLD_LIBRARY_PATH");
|
|
+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))
|
|
{
|
|
printf ("Couldn't turn forced writes off\n");
|
|
@@ -104,7 +106,7 @@
|
|
}
|
|
|
|
printf ("Creating tables\n");
|
|
-sprintf (cmd, "isql %s -q -i empddl.sql", Db_name);
|
|
+sprintf (cmd, "DYLD_LIBRARY_PATH=%s isql %s -q -i empddl.sql", lp, Db_name);
|
|
if (system (cmd))
|
|
{
|
|
printf ("Couldn't create tables \n");
|
|
@@ -120,7 +122,7 @@
|
|
}
|
|
|
|
printf ("Turning off indices and triggers \n");
|
|
-sprintf (cmd, "isql %s -i indexoff.sql", Db_name);
|
|
+sprintf (cmd, "DYLD_LIBRARY_PATH=%s isql %s -i indexoff.sql", lp, Db_name);
|
|
if (system (cmd))
|
|
{
|
|
printf ("Couldn't turn off indices and triggers \n");
|
|
@@ -128,7 +130,7 @@
|
|
}
|
|
|
|
printf ("Loading column data\n");
|
|
-sprintf (cmd, "isql %s -i empdml.sql", Db_name);
|
|
+sprintf (cmd, "DYLD_LIBRARY_PATH=%s isql %s -i empdml.sql", lp, Db_name);
|
|
if (system (cmd))
|
|
{
|
|
printf ("Couldn't load column data \n");
|
|
@@ -136,7 +138,7 @@
|
|
}
|
|
|
|
printf ("Turning on indices and triggers \n");
|
|
-sprintf (cmd, "isql %s -i indexon.sql", Db_name);
|
|
+sprintf (cmd, "DYLD_LIBRARY_PATH=%s isql %s -i indexon.sql", lp, Db_name);
|
|
if (system (cmd))
|
|
{
|
|
printf ("Couldn't turn on indices and triggers \n");
|