diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-02 11:04:40 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-02 12:53:01 +0200 |
| commit | ce170cf1f264c69e91cde268ee490584c8fbcd04 (patch) | |
| tree | a4a6550d6c6f9f8cea3dc7870398088585149bdf /external/firebird/UnpackedTarball_firebird.mk | |
| parent | 329e6f1a033dc45e9d9f7a50e3237bb65618ed3f (diff) | |
Allow external/firebird to be built with a custom SHELL under Mac OS X 10.11
...which broke all the stock /bin shells to no longer pass through any DYLD_*
environment variables, so the DYLD_LIBRARY_PATH passed into the firebird Make
would not be passed to all the places that need it (to find the external/icu
libraries that some executables link against which are built and run as part of
building firebird).
What works with two little tweaks is to build your own bash and pass it to make
with SHELL=...:
* For one, there is an empbuild executable that uses system(...) to call another
isql executable, where the latter needs DYLD_LIBRARY_PATH set, but which would
not pass through the system(...) call (which implicityl uses /bin/sh).
* For another, it is still necessary to invoke Firebird's make with an explicit
SHELL=$(SHELL), for reasons that are not entirely clear to me. (There are
some Makefile.in in Firebird's extern/ sub-tree that set "SHELL = @SHELL@" to
configure's CONFIG_SHELL, unless overriden via an explicit command line
arguemnt, but I don't think those are relevant here.)
Change-Id: I1e68faa898e758f09efb602d96fd6b35657e0480
Diffstat (limited to 'external/firebird/UnpackedTarball_firebird.mk')
| -rw-r--r-- | external/firebird/UnpackedTarball_firebird.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk index c42cbd5f1201..9701fc2f0108 100644 --- a/external/firebird/UnpackedTarball_firebird.mk +++ b/external/firebird/UnpackedTarball_firebird.mk @@ -31,6 +31,7 @@ ifeq ($(OS),MACOSX) $(eval $(call gb_UnpackedTarball_add_patches,firebird,\ external/firebird/firebird-macosx.patch.1 \ external/firebird/firebird-configure-x86-64-macosx.patch.1 \ + external/firebird/macosx-elcapitan-dyld.patch \ )) endif # vim: set noet sw=4 ts=4: |