[libreoffice] 03/04: clarify that sc_subsequent_filters_test *does* build with system-cppunit
Rene Engelhard
rene at moszumanska.debian.org
Thu May 4 16:52:21 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.
commit c24c8126f7bdf2780fa08eb7ab15b68385ec9cef
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Thu May 4 12:51:58 2017 +0200
clarify that sc_subsequent_filters_test *does* build with system-cppunit
---
patches/temporarily-disable-sc_subsequent_filters_test.diff | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/patches/temporarily-disable-sc_subsequent_filters_test.diff b/patches/temporarily-disable-sc_subsequent_filters_test.diff
index 1e93c7e..4052e19 100644
--- a/patches/temporarily-disable-sc_subsequent_filters_test.diff
+++ b/patches/temporarily-disable-sc_subsequent_filters_test.diff
@@ -1,9 +1,13 @@
+# fails with internal cppunit:
+#
# [build LNK] CppunitTest/libtest_sc_subsequent_filters_test.so
# S=/data/rene/git/LibreOffice/master && I=$S/instdir && W=$S/workdir && /usr/bin/ccache x86_64-linux-gnu-g++ -shared -Wl,-z,noexecstack -Wl,-z,origin '-Wl,-rpath,$ORIGIN/../Library' -Wl,-rpath-link,$I/program -Wl,-z,defs -Wl,-rpath-link,/lib:/usr/lib -Wl,-z,combreloc -Wl,--hash-style=gnu -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo -Wl,-Bsymbolic-functions -L$W/LinkTarget/StaticLibrary -L$I/sdk/lib -L$I/program -L$I/program -L$W/LinkTarget/Library -Wl,-z,relro - [...]
# /data/rene/git/LibreOffice/master/workdir/CxxObject/sc/qa/unit/subsequent_filters-test.o:(.data.rel.ro._ZTIN7CppUnit17AdditionalMessageE[_ZTIN7CppUnit17AdditionalMessageE]+0x10): undefined reference to `typeinfo for CppUnit::Message'
# collect2: error: ld returned 1 exit status
# /data/rene/git/LibreOffice/master/solenv/gbuild/LinkTarget.mk:598: recipe for target '/data/rene/git/LibreOffice/master/workdir/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so' failed
# make[4]: *** [/data/rene/git/LibreOffice/master/workdir/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so] Error 1
+#
+# interestingly, this works with system-cppunit, so this patch can be removed when we can use that
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index ef82147d781b..b3cadf5d7102 100644
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list