external/firebird/ExternalProject_firebird.mk | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 61411db9f719d793f0665a4d278e0748e8fcd75f
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Apr 9 11:06:26 2018 +0200
external/firebird: ICU_UCHAR_TYPE breaks -fsanitize=function
...while building external/firebird, and should not be necessary in a C++
project anyway (cf. 4c404950225e07ec7ee5275657a3192a5af79a04
"ICU_UCHAR_TYPE is
not needed for C++11 projects"). I started to get this failure around the
time
I switched the machine from Fedora 27 to Fedora 28 beta, but not sure
whether
the issue is related to that, nor why it only started to happen now:
> workdir/UnpackedTarball/firebird/src/intl/cs_icu.cpp:67:30: runtime
error: call to function ucnv_fromUChars_60 through pointer to incorrect
function type 'int (*)(UConverter *, char *, int, const unsigned short *, int,
UErrorCode *)'
> workdir/UnpackedTarball/icu/source/common/ucnv.cpp:1720: note:
ucnv_fromUChars_60 defined here
> #0 in CSICU_charset_init(charset*, char const*) at
workdir/UnpackedTarball/firebird/src/intl/cs_icu.cpp:67:30
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/intl/libfbintl.so +0xb5a9c)
> #1 in LD_lookup_charset at
workdir/UnpackedTarball/firebird/src/intl/ld.cpp:484:10
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/intl/libfbintl.so +0xb34e4)
> #2 in LCICU_setup_attributes(char const*, char const*, char const*,
Firebird::StringBase<Firebird::StringComparator> const&,
Firebird::StringBase<Firebird::StringComparator>&) at
workdir/UnpackedTarball/firebird/src/intl/lc_icu.cpp:128:8
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/intl/libfbintl.so +0xaf3e2)
> #3 in LD_setup_attributes at
workdir/UnpackedTarball/firebird/src/intl/ld.cpp:568:7
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/intl/libfbintl.so +0xb47ff)
> #4 in
Jrd::IntlManager::setupCollationAttributes(Firebird::StringBase<Firebird::StringComparator>
const&, Firebird::StringBase<Firebird::StringComparator> const&,
Firebird::StringBase<Firebird::StringComparator> const&,
Firebird::StringBase<Firebird::StringComparator>&) at
workdir/UnpackedTarball/firebird/src/jrd/IntlManager.cpp:689:16
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so
+0x16ecd8b)
> #5 in setupSpecificCollationAttributes(Jrd::thread_db*, Jrd::jrd_tra*,
unsigned short, char const*) at
workdir/UnpackedTarball/firebird/temp/Debug/jrd/dfw.cpp:7483:7
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so
+0x1918f67)
> #6 in create_collation(Jrd::thread_db*, short, Jrd::DeferredWork*,
Jrd::jrd_tra*) at
workdir/UnpackedTarball/firebird/temp/Debug/jrd/dfw.cpp:7542:3
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so
+0x1936e2e)
> #7 in DFW_perform_work(Jrd::thread_db*, Jrd::jrd_tra*) at
workdir/UnpackedTarball/firebird/temp/Debug/jrd/dfw.cpp:4513:11
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so
+0x1912e49)
> #8 in DFW_perform_system_work(Jrd::thread_db*) at
workdir/UnpackedTarball/firebird/temp/Debug/jrd/dfw.cpp:4457:2
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so
+0x191259d)
> #9 in INI_format(char const*, char const*) at
workdir/UnpackedTarball/firebird/temp/Debug/jrd/ini.cpp:1808:2
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so
+0x18df473)
> #10 in Jrd::JProvider::createDatabase(Firebird::CheckStatusWrapper*,
char const*, unsigned int, unsigned char const*) at
workdir/UnpackedTarball/firebird/src/jrd/jrd.cpp:2691:4
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so
+0x172d05f)
> #11 in Firebird::IProviderBaseImpl<Jrd::JProvider,
Firebird::CheckStatusWrapper, Firebird::IPluginBaseImpl<Jrd::JProvider,
Firebird::CheckStatusWrapper,
Firebird::Inherit<Firebird::IReferenceCountedImpl<Jrd::JProvider,
Firebird::CheckStatusWrapper,
Firebird::Inherit<Firebird::IVersionedImpl<Jrd::JProvider,
Firebird::CheckStatusWrapper, Firebird::Inherit<Firebird::IProvider> > > > > >
>::cloopcreateDatabaseDispatcher(Firebird::IProvider*, Firebird::IStatus*, char
const*, unsigned int, unsigned char const*) at
workdir/UnpackedTarball/firebird/src/include/firebird/IdlFbInterfaces.h:9010:44
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so
+0x10d511f)
> #12 in Firebird::IAttachment*
Firebird::IProvider::createDatabase<Firebird::CheckStatusWrapper>(Firebird::CheckStatusWrapper*,
char const*, unsigned int, unsigned char const*) at
workdir/UnpackedTarball/firebird/src/include/firebird/IdlFbInterfaces.h:2034:23
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/lib/libfbclient.so.2
+0x3937f4)
> #13 in
Why::Dispatcher::attachOrCreateDatabase(Firebird::CheckStatusWrapper*, bool,
char const*, unsigned int, unsigned char const*) at
workdir/UnpackedTarball/firebird/src/yvalve/why.cpp:5681:15
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/lib/libfbclient.so.2
+0x35adb7)
> #14 in Why::Dispatcher::createDatabase(Firebird::CheckStatusWrapper*,
char const*, unsigned int, unsigned char const*) at
workdir/UnpackedTarball/firebird/src/yvalve/why.cpp:5606:9
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/lib/libfbclient.so.2
+0x35baa4)
> #15 in PREPARSE_execute(Firebird::CheckStatusWrapper*,
Why::YAttachment**, unsigned short, char const*, bool*, unsigned short) at
workdir/UnpackedTarball/firebird/src/yvalve/preparse.cpp:288:26
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/lib/libfbclient.so.2
+0x427888)
> #16 in
Why::UtilInterface::executeCreateDatabase(Firebird::CheckStatusWrapper*,
unsigned int, char const*, unsigned int, unsigned char*) at
workdir/UnpackedTarball/firebird/src/yvalve/utl.cpp:587:8
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/lib/libfbclient.so.2
+0x481209)
> #17 in Firebird::IUtilBaseImpl<Why::UtilInterface,
Firebird::CheckStatusWrapper, Firebird::IVersionedImpl<Why::UtilInterface,
Firebird::CheckStatusWrapper, Firebird::Inherit<Firebird::IUtil> >
>::cloopexecuteCreateDatabaseDispatcher(Firebird::IUtil*, Firebird::IStatus*,
unsigned int, char const*, unsigned int, unsigned char*) at
workdir/UnpackedTarball/firebird/src/include/firebird/IdlFbInterfaces.h:12375:44
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/lib/libfbclient.so.2
+0x495a09)
> #18 in Firebird::IAttachment*
Firebird::IUtil::executeCreateDatabase<Firebird::CheckStatusWrapper>(Firebird::CheckStatusWrapper*,
unsigned int, char const*, unsigned int, unsigned char*) at
workdir/UnpackedTarball/firebird/src/include/firebird/IdlFbInterfaces.h:3504:23
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/bin/isql +0x4c41df)
> #19 in create_db(char const*, char*) at
workdir/UnpackedTarball/firebird/temp/Debug/isql/isql.cpp:5314:38
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/bin/isql +0x48606b)
> #20 in frontend(char const*) at
workdir/UnpackedTarball/firebird/temp/Debug/isql/isql.cpp:6152:10
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/bin/isql +0x477e4e)
> #21 in get_statement(char*, unsigned long, char const*) at
workdir/UnpackedTarball/firebird/temp/Debug/isql/isql.cpp:7019:9
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/bin/isql +0x4740e6)
> #22 in do_isql() at
workdir/UnpackedTarball/firebird/temp/Debug/isql/isql.cpp:5481:9
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/bin/isql +0x461d48)
> #23 in ISQL_main(int, char**) at
workdir/UnpackedTarball/firebird/temp/Debug/isql/isql.cpp:1693:3
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/bin/isql +0x45d8cf)
> #24 in main at
workdir/UnpackedTarball/firebird/temp/Debug/isql/isql.cpp:1599:9
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/bin/isql +0x45cf09)
> #25 in __libc_start_main at <null> (/lib64/libc.so.6 +0x231ba)
> #26 in _start at <null>
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/bin/isql +0x40bd89)
Change-Id: I7b31e2e6dd745e50d02c68369c7a1e8072ae9534
Reviewed-on: https://gerrit.libreoffice.org/52622
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/external/firebird/ExternalProject_firebird.mk
b/external/firebird/ExternalProject_firebird.mk
index 8f2b576de115..e1ab197227d1 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -70,7 +70,6 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
-I$(call
gb_UnpackedTarball_get_dir,icu)/source/i18n \
-I$(call
gb_UnpackedTarball_get_dir,icu)/source/common \
) \
- $(ICU_UCHAR_TYPE) \
$(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_CFLAGS), \
-L$(call gb_UnpackedTarball_get_dir,libtommath)
\
) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
