firebird/ExternalPackage_firebird.mk | 5 +---
firebird/UnpackedTarball_firebird.mk | 1
firebird/firebird-rpath.patch.0 | 11 +++++++++
scp2/source/firebird/file_firebird.scp | 37 ++++---------------------------
scp2/source/firebird/module_firebird.scp | 6 -----
5 files changed, 19 insertions(+), 41 deletions(-)
New commits:
commit cfdfd1ad7652ee3699115618465a85e3431b33f3
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Aug 29 16:03:14 2013 +0200
Simplify and fix the embedded Firebird on Linux
Change-Id: Ibd29bb964cd090cbfd958a9e54658249e8ce4317
diff --git a/firebird/ExternalPackage_firebird.mk
b/firebird/ExternalPackage_firebird.mk
index 3778d52..6419c30 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 8370f31..46baf71 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 0000000..a92f006
--- /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
diff --git a/scp2/source/firebird/file_firebird.scp
b/scp2/source/firebird/file_firebird.scp
index a5784a3..3f89147 100644
--- a/scp2/source/firebird/file_firebird.scp
+++ b/scp2/source/firebird/file_firebird.scp
@@ -20,43 +20,16 @@
#ifndef SYSTEM_FIREBIRD
-/*File gid_File_Firebird
- TXT_FILE_BODY;
- Dir = gid_Dir_Brand_Root;
- Name = "firebird.filelist";
- Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End*/
-
-#if !defined MACOSX
-
-File gid_File_Firebird_Lib_252
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_LIB_DIR;
- #ifdef UNX
- Name = STRING(CONCAT4(libfbembed,UNXSUFFIX,.,2.5.2));
- #endif
-End
-
-File gid_File_Firebird_Lib_25
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_LIB_DIR;
- #ifdef UNX
- Name = STRING(CONCAT4(libfbembed,UNXSUFFIX,.,2.5));
- #endif
-End
-
-#endif
-
File gid_File_Firebird_Lib
LIB_FILE_BODY;
Styles = (PACKED);
Dir = SCP2_OOO_LIB_DIR;
- #ifdef UNX
- Name = STRING(CONCAT2(libfbembed,UNXSUFFIX));
+ #if defined MACOSX
+ Name = "libfbembed.dylib";
+ #elif defined UNX
+ Name = STRING(CONCAT3(libfbembed,UNXSUFFIX,.2.5));
#else
- Name = "ifbembed.dll";
+ Name = "ifbembed.dll";
#endif
End
diff --git a/scp2/source/firebird/module_firebird.scp
b/scp2/source/firebird/module_firebird.scp
index de1b41d..88c0eb4 100644
--- a/scp2/source/firebird/module_firebird.scp
+++ b/scp2/source/firebird/module_firebird.scp
@@ -23,15 +23,9 @@
Module gid_Module_Firebird
PackageInfo = "packinfo_office.txt";
ParentID = gid_Module_Root_Brand;
- Dirs = ();
Files = (
-#if defined UNX && !defined MACOSX
- File gid_File_Firebird_Lib_252,
- File gid_File_Firebird_Lib_25,
-#endif
File gid_File_Firebird_Lib
);
- Unixlinks = ();
Styles = (HIDDEN_ROOT);
End
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
