zepto-forks/meta-office
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libreoffice-native: output more debug information

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2015-11-27 00:39:01 +01:00
parent 310208e4c5
commit 60d0958490
2 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
recipes-libreoffice/libreoffice/files/0007-cppumaker-output-more-detailed-error-message.patch Normal file
View File

@@ -0,0 +1,35 @@
From 98774bf61294703183118b7953f6a92cad6da068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 26 Nov 2015 17:48:19 +0100
Subject: [PATCH] cppumaker: output more detailed error message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
codemaker/source/cppumaker/cpputype.cxx | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 0b3e9fd..26a9a73 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -3385,11 +3385,7 @@ static OUString failsToSupply(const OUString& name_, const OString& baseName)
{
return OUString(
"\n"
- "#if OSL_DEBUG_LEVEL > 0\n"
- " ::rtl::OUString(\"component context fails to supply service '" + name_ + "' of type '" + OStringToOUString(baseName, RTL_TEXTENCODING_UTF8) + "'\")\n"
- "#else\n"
- " ::rtl::OUString(\"service not supplied\")\n"
- "#endif\n");
+ " ::rtl::OUString(\"component context fails to supply service '" + name_ + "' of type '" + OStringToOUString(baseName, RTL_TEXTENCODING_UTF8) + "'\")\n");
}
void ServiceType::dumpHxxFile(
--
2.1.0

10
recipes-libreoffice/libreoffice/libreoffice-native.bb
View File

@@ -11,9 +11,13 @@ DEPENDS += " \
SRC_URI += " \
file://0006-saxparser-output-calling-parametrs-for-debug.patch \
file://0007-cppumaker-output-more-detailed-error-message.patch \
"
EXTRA_OECONF += " \
--enable-debug \
--enable-dbgutil \
\
--enable-python=system \
--without-x \
--with-system-curl \
@@ -48,6 +52,9 @@ do_configure() {
oe_runconf
}
CXXFLAGS += "-g -O0 -DSAL_LOG_INFO -DSAL_LOG_WARN"
LDFLAGS += "-g"
do_compile() {
BUILDDIR=${B} oe_runmake -f ${S}/Makefile.gbuild build-tools
}
@@ -64,8 +71,9 @@ do_install() {
# install sdk binaries
install ${B}/instdir/sdk/bin/* ${D}/${bindir}
# install libraries and defaults
install -d ${D}/${libdir}
for name in `find ${B}/instdir/program -name *.so*` ; do
for name in `find ${B}/instdir/program -type f` ; do
install "$name" ${D}/${libdir}
done
}