mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves fdo#72543: ib_util not found when creating or accessing new firebird

Browse Source 
... embedded database
See https://bugs.freedesktop.org/show_bug.cgi?id=72543#c8
and https://bugs.freedesktop.org/show_bug.cgi?id=72543#c13

Change-Id: I299ab193333f43ff9aa87362adf76d3a362279fc
Reviewed-on: https://gerrit.libreoffice.org/14146
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
This commit is contained in:
Julien Nabet
2015-01-23 22:28:55 +01:00
committed by Lionel Elie Mamane
parent 0a77c9f15b
commit e3c0025461
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
external/firebird/UnpackedTarball_firebird.mk vendored
View File

@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-c++11.patch.1 \
external/firebird/firebird-c++11replfn.patch.0 \
external/firebird/firebird-no-open-temp-on-shutdown.patch.1 \
external/firebird/firebird.disable-ib-util-not-found.patch.1 \
))
ifeq ($(OS)-$(COM),WNT-MSC)

19
external/firebird/firebird.disable-ib-util-not-found.patch.1 vendored Normal file
View File

@@ -0,0 +1,19 @@
--- firebird.org/src/jrd/fun.epp 2015-01-23 22:11:26.751475044 +0100
+++ firebird/src/jrd/fun.epp 2015-01-23 22:16:42.507322568 +0100
@@ -160,10 +160,14 @@
if (tryLibrary(LIBNAME, message[3]))
return;
+ /* fdo#72543: quote from https://bugs.freedesktop.org/show_bug.cgi?id=72543#c8
+ "we don't need UDF support for embedded firebird,
+ hence the lack of ib_util isn't an issue and can safely be ignored"
// all failed - log error
gds__log("ib_util init failed, UDFs can't be used - looks like firebird misconfigured\n"
"\t%s\n\t%s\n\t%s\n\t%s", message[0].c_str(), message[1].c_str(),
message[2].c_str(), message[3].c_str());
+ */
#endif // !BOOT_BUILD
}
Seulement dans firebird/src/misc: codes.cpp
Seulement dans firebird: temp