libreoffice/external/firebird/firebird-rpath.patch.0

--- builds/posix/make.defaults
+++ builds/posix/make.defaults
@@ -279,7 +279,7 @@
 
 ifeq (@USE_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
Simplify and fix the embedded Firebird on Linux Change-Id: Ibd29bb964cd090cbfd958a9e54658249e8ce4317 2013-08-29 16:03:14 +02:00			`--- builds/posix/make.defaults`
			`+++ builds/posix/make.defaults`
GSoC Upgrade firebird to 3.0 Embedded firebird is now version 3.0. Supports MSVC 14.0. Instead of fbembed, there are now two libraries: fbclient and Engine12. fbclient is linked as fbembed before, Engine12 is loaded at runtime from fbclient. fb now needs system libtommath, which is supplied as a new ExternalProject of LO. Change-Id: I132939bdee745795b22f675e4265e9590079c45f Reviewed-on: https://gerrit.libreoffice.org/27642 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> 2016-07-28 17:16:19 +02:00			`@@ -279,7 +279,7 @@`
Simplify and fix the embedded Firebird on Linux Change-Id: Ibd29bb964cd090cbfd958a9e54658249e8ce4317 2013-08-29 16:03:14 +02:00
GSoC Upgrade firebird to 3.0 Embedded firebird is now version 3.0. Supports MSVC 14.0. Instead of fbembed, there are now two libraries: fbclient and Engine12. fbclient is linked as fbembed before, Engine12 is loaded at runtime from fbclient. fb now needs system libtommath, which is supplied as a new ExternalProject of LO. Change-Id: I132939bdee745795b22f675e4265e9590079c45f Reviewed-on: https://gerrit.libreoffice.org/27642 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> 2016-07-28 17:16:19 +02:00			`ifeq (@USE_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`