diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-08-19 15:02:05 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-08-19 15:02:05 +0200 |
| commit | e1c16a523eeb612cd25191a9c2994d8eded64b72 (patch) | |
| tree | 01228cbe94cf82b79cf01df19ca34875c682e092 /external | |
| parent | af9800b7bf6d19b15fff9ef9c50b4b696f7dc3b9 (diff) | |
Revive external/firebird/macosx-elcapitan-dyld.patch
Change-Id: I382080f89b59a6cc642c829377954b72dae44abe
Diffstat (limited to 'external')
| -rw-r--r-- | external/firebird/UnpackedTarball_firebird.mk | 1 | ||||
| -rw-r--r-- | external/firebird/macosx-elcapitan-dyld.patch | 35 |
2 files changed, 28 insertions, 8 deletions
diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk index ba625974e29d..861b212dc15d 100644 --- a/external/firebird/UnpackedTarball_firebird.mk +++ b/external/firebird/UnpackedTarball_firebird.mk @@ -32,6 +32,7 @@ ifeq ($(OS),MACOSX) $(eval $(call gb_UnpackedTarball_add_patches,firebird,\ external/firebird/firebird-configure-x86-64-macosx.patch.1 \ external/firebird/firebird-macosx.patch.1 \ + external/firebird/macosx-elcapitan-dyld.patch \ )) endif diff --git a/external/firebird/macosx-elcapitan-dyld.patch b/external/firebird/macosx-elcapitan-dyld.patch index b8c4c1cdf419..134cdd974687 100644 --- a/external/firebird/macosx-elcapitan-dyld.patch +++ b/external/firebird/macosx-elcapitan-dyld.patch @@ -9,31 +9,50 @@ if (argc > 1) strcpy (Db_name, argv[1]); -@@ -94,21 +94,23 @@ +@@ -94,7 +94,9 @@ } - printf ("Creating tables\n"); + 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"); - exit (FINI_ERROR); +@@ -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); - system (cmd); + 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); - system (cmd); + 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); - system (cmd); - - EXEC SQL CONNECT DB; + if (system (cmd)) + { + printf ("Couldn't turn on indices and triggers \n"); |