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 /solenv | |
| 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 'solenv')
| -rw-r--r-- | solenv/bin/macosx-change-install-names.pl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl index 111f5cf0198c..7e5645c92f01 100644 --- a/solenv/bin/macosx-change-install-names.pl +++ b/solenv/bin/macosx-change-install-names.pl @@ -58,8 +58,6 @@ sub action($$$) 'shl/URELIB/URELIB' => '@loader_path', 'shl/OOO/URELIB' => ($OLD ? '@loader_path/../ure-link/lib' : '@loader_path'), 'shl/OOO/OOO' => '@loader_path', - 'fb/OOO/URELIB' => ($OLD ? '@rpath/../ure-link/lib' : '@executable_path/../Frameworks'), - 'fb/OOO/OOO' => '@rpath', 'shl/OXT/URELIB' => ($OLD ? '@executable_path/urelibs' : '@executable_path/../Frameworks'), 'shl/NONE/URELIB' => '@__VIA_LIBRARY_PATH__', 'shl/NONE/OOO' => '@__VIA_LIBRARY_PATH__', @@ -70,7 +68,7 @@ sub action($$$) return $act; } -@ARGV >= 2 or die 'Usage: app|shl|fb UREBIN|URELIB|OOO|SDKBIN|OXT|NONE <filepath>*'; +@ARGV >= 2 or die 'Usage: app|shl UREBIN|URELIB|OOO|SDKBIN|OXT|NONE <filepath>*'; $type = shift @ARGV; $loc = shift @ARGV; foreach $file (@ARGV) |