diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-29 10:11:50 +0300 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-08-29 14:57:14 +0200 |
| commit | a1d2668c193e99044ac77d171eac651c0ad4c263 (patch) | |
| tree | f1d27d79fbfc5666f9da76054215b617024b9a56 /scp2 | |
| parent | d9b62a48d75e596888fcf10f5f73fed93e7b88a3 (diff) | |
Simplify and fix the embedded Firebird on OS X
Don't bother constructing a Firebird framework and especially don't
pretend we would have it at run-time in
/Library/Frameworks/Firebird.framework. We only need the
libfbembed.dylib, I hope.
We need just libfbembed.dylib, not the version-numbered copies.
Use gb_Helper_set_ld_path instead of manipulating LD_LIBRARY_PATH and
DYLD_LIBRARY_PATH explicitly.
Don't let Firebird's build mechanism totally override DYLD_LIBRARY_PATH.
No need to handle "fb" specially in macosx-change-install-name.pl.
We need to call macosx-change-install-name.pl on libfbembed.dylib,
too.
Change-Id: Id7e6c91a6763e1d5ede5c935b4c4fd946ae00f20
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_firebird.mk | 4 | ||||
| -rw-r--r-- | scp2/source/firebird/file_firebird.scp | 28 | ||||
| -rw-r--r-- | scp2/source/firebird/module_firebird.scp | 5 |
3 files changed, 16 insertions, 21 deletions
diff --git a/scp2/InstallModule_firebird.mk b/scp2/InstallModule_firebird.mk index 4ee945d16be8..e27503a54c35 100644 --- a/scp2/InstallModule_firebird.mk +++ b/scp2/InstallModule_firebird.mk @@ -15,7 +15,9 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/firebird,\ )) $(eval $(call gb_InstallModule_define_if_set,scp2/firebird,\ - SYSTEM_FIREBIRD \ + ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \ + ENABLE_MACOSX_SANDBOX \ + SYSTEM_FIREBIRD \ )) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/source/firebird/file_firebird.scp b/scp2/source/firebird/file_firebird.scp index 9391a47175db..a5784a3b1fb1 100644 --- a/scp2/source/firebird/file_firebird.scp +++ b/scp2/source/firebird/file_firebird.scp @@ -27,42 +27,34 @@ Styles = (FILELIST,USE_INTERNAL_RIGHTS); End*/ +#if !defined MACOSX + File gid_File_Firebird_Lib_252 LIB_FILE_BODY; Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + Dir = SCP2_OOO_LIB_DIR; #ifdef UNX - #ifdef MACOSX - Name = STRING(CONCAT4(libfbembed,.,2.5.2,UNXSUFFIX)); - #else - Name = STRING(CONCAT4(libfbembed,UNXSUFFIX,.,2.5.2)); - #endif + Name = STRING(CONCAT4(libfbembed,UNXSUFFIX,.,2.5.2)); #endif End File gid_File_Firebird_Lib_25 LIB_FILE_BODY; Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + Dir = SCP2_OOO_LIB_DIR; #ifdef UNX - #ifdef MACOSX - Name = STRING(CONCAT4(libfbembed,.,2.5,UNXSUFFIX)); - #else - Name = STRING(CONCAT4(libfbembed,UNXSUFFIX,.,2.5)); - #endif + Name = STRING(CONCAT4(libfbembed,UNXSUFFIX,.,2.5)); #endif End +#endif + File gid_File_Firebird_Lib LIB_FILE_BODY; Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + Dir = SCP2_OOO_LIB_DIR; #ifdef UNX - #ifdef MACOSX - Name = STRING(CONCAT2(libfbembed,UNXSUFFIX)); - #else - Name = STRING(CONCAT2(libfbembed,UNXSUFFIX)); - #endif + Name = STRING(CONCAT2(libfbembed,UNXSUFFIX)); #else Name = "ifbembed.dll"; #endif diff --git a/scp2/source/firebird/module_firebird.scp b/scp2/source/firebird/module_firebird.scp index 7a37a16cb13a..de1b41dbe4e3 100644 --- a/scp2/source/firebird/module_firebird.scp +++ b/scp2/source/firebird/module_firebird.scp @@ -25,7 +25,7 @@ Module gid_Module_Firebird ParentID = gid_Module_Root_Brand; Dirs = (); Files = ( -#ifdef UNX +#if defined UNX && !defined MACOSX File gid_File_Firebird_Lib_252, File gid_File_Firebird_Lib_25, #endif @@ -34,4 +34,5 @@ Module gid_Module_Firebird Unixlinks = (); Styles = (HIDDEN_ROOT); End -#endif
\ No newline at end of file + +#endif |