diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk index 79fe914467d7..c42cbd5f1201 100644 --- a/external/firebird/UnpackedTarball_firebird.mk +++ b/external/firebird/UnpackedTarball_firebird.mk @@ -11,11 +11,14 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,firebird)) $(eval $(call gb_UnpackedTarball_set_tarball,firebird,$(FIREBIRD_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_patchlevel,firebird,0)) + $(eval $(call gb_UnpackedTarball_add_patches,firebird,\ external/firebird/firebird-rpath.patch.0 \ external/firebird/firebird-c++11.patch.1 \ external/firebird/firebird-c++11replfn.patch.0 \ external/firebird/firebird.disable-ib-util-not-found.patch.1 \ + external/firebird/firebird-c++14.patch \ )) ifeq ($(OS)-$(COM),WNT-MSC) diff --git a/external/firebird/firebird-c++14.patch b/external/firebird/firebird-c++14.patch new file mode 100644 index 000000000000..ad095bf6793e --- /dev/null +++ b/external/firebird/firebird-c++14.patch @@ -0,0 +1,14 @@ +--- src/common/classes/alloc.cpp ++++ src/common/classes/alloc.cpp +@@ -2121,3 +2121,11 @@ + { + Firebird::MemoryPool::globalFree(mem); + } ++void operator delete(void* mem, size_t) throw() ++{ ++ Firebird::MemoryPool::globalFree(mem); ++} ++void operator delete[](void* mem, size_t) throw() ++{ ++ Firebird::MemoryPool::globalFree(mem); ++}