summaryrefslogtreecommitdiff
path: root/external/firebird/asan.patch
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2020-11-13 18:45:29 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-11-26 15:06:59 +0100
commit86744f03992213af162df6954313c9f9e44e3a0a (patch)
treeac3eb1d28ad78a81ad8d453c560415059540c0c0 /external/firebird/asan.patch
parent952242a20cdc4a0248a95c1e1d61b1c213ae270a (diff)
firebird: update to 3.0.7
This tries to get rid of a lot of cruft from older builds and it also aims to build as much as possible on Windows. The firebird-cygwin-msvc-warnings.patch should be optional. It gets rid of various compiler warnings on Windows, either by disableing or fixing them: - fix: D9002 - ignoring unknown option '-fno-rtti' - fix: D9024 - unrecognized source file type <filename>, object file assumed - ign: C4291 - <declaration>: no matching operator delete found; memory will not be freed if initialization throws an exception - ign: C4477 - <function>: format string <string> requires an argument of type <type>, but variadic argument number has type <type> And I explicitly got rid of the "win32" handling and simply use arch depending patches on Windows, which strips additional stuff. sberg adds: I have no idea how in an upstream macOS build the empbuild executible in gen/examples should now find @rpath/lib/libfbclient.dylib, as it does not have an RPATH set. So add an appropriate one in external/firebird/firebird-macosx.patch.1's patch of builds/posix/Makefile.in.examples (which needs to know whether we do a Debug or a Release build; an attempt of using firebird's $(IsDeveloper) for that caused other failures, see bca0dc97bf3d1348c928bdaf4964524374835823 "Revert 'external/firebird: Pass --enable-developer into configure'", so use LO's $(ENABLE_DEBUG) and rely on that being exported from LO's make into firebird's make). Also, the fbclient and Engine12 dylibs now have RPATHs set which we do not need in LO (where we still stick to our general use of @loader_path), so drop them in external/firebird/ExternalProject_firebird.mk (even though leaving them in should be harmless). Change-Id: Id34bb88900d15f89adda03e34af2ac3d4f6aa085 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105440 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/firebird/asan.patch')
-rw-r--r--external/firebird/asan.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/external/firebird/asan.patch b/external/firebird/asan.patch
index 5ee7744e1038..2564c54d46ea 100644
--- a/external/firebird/asan.patch
+++ b/external/firebird/asan.patch
@@ -230,7 +230,7 @@
static const unsigned INCREASE_FACTOR = 50;
unsigned size;
- AutoPtr<UCHAR> data;
-+ AutoPtr<UCHAR, ArrayDelete<UCHAR>> data;
++ AutoPtr<UCHAR, ArrayDelete> data;
T* end;
};
#endif // RECURSIVE_SIMILAR