diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-08-29 16:03:14 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-08-29 16:03:14 +0200 |
| commit | cfdfd1ad7652ee3699115618465a85e3431b33f3 (patch) | |
| tree | d404b858f7426c63d8f4e585135779a48e877366 /firebird | |
| parent | 17e904ed66c3caf87e658b9d3a18d7b13f4a0b52 (diff) | |
Simplify and fix the embedded Firebird on Linux
Change-Id: Ibd29bb964cd090cbfd958a9e54658249e8ce4317
Diffstat (limited to 'firebird')
| -rw-r--r-- | firebird/ExternalPackage_firebird.mk | 5 | ||||
| -rw-r--r-- | firebird/UnpackedTarball_firebird.mk | 1 | ||||
| -rw-r--r-- | firebird/firebird-rpath.patch.0 | 11 |
3 files changed, 14 insertions, 3 deletions
diff --git a/firebird/ExternalPackage_firebird.mk b/firebird/ExternalPackage_firebird.mk index 3778d52a3383..6419c30ccc43 100644 --- a/firebird/ExternalPackage_firebird.mk +++ b/firebird/ExternalPackage_firebird.mk @@ -17,9 +17,8 @@ $(eval $(call gb_ExternalPackage_add_file,firebird,lib/ifbembed.lib,gen/firebird else ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.2)) else -$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5.2,gen/firebird/lib/libfbembed.so.2.5.2)) -$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5)) -$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so,gen/firebird/lib/libfbembed.so)) +$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5.2)) +$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so,gen/firebird/lib/libfbembed.so.2.5.2)) endif # vim: set noet sw=4 ts=4: diff --git a/firebird/UnpackedTarball_firebird.mk b/firebird/UnpackedTarball_firebird.mk index 8370f314335a..46baf71d25ba 100644 --- a/firebird/UnpackedTarball_firebird.mk +++ b/firebird/UnpackedTarball_firebird.mk @@ -13,6 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,firebird,$(FIREBIRD_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,firebird,\ firebird/firebird-icu.patch.1 \ + firebird/firebird-rpath.patch.0 \ )) $(eval $(call gb_UnpackedTarball_add_patches,firebird,\ diff --git a/firebird/firebird-rpath.patch.0 b/firebird/firebird-rpath.patch.0 new file mode 100644 index 000000000000..a92f0064b20f --- /dev/null +++ b/firebird/firebird-rpath.patch.0 @@ -0,0 +1,11 @@ +--- builds/posix/make.defaults ++++ builds/posix/make.defaults +@@ -255,7 +255,7 @@ + + LIB_PLATFORM_RPATH = -Wl,-rpath,$(1) + ifeq ($(strip @BINRELOC_CFLAGS@),) +-LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,$(if $(subst intl,,$(1)),@FB_LIBDIR@,@FB_INTLDIR@)) ++LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,'$$ORIGIN') + else + LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,'$$$$ORIGIN/../$(1)') + endif |