[libreoffice] fix x86 cppunit build problem

Caolan McNamara caolanm at fedoraproject.org
Mon Oct 11 14:40:41 UTC 2010


commit bd100d63383d69d687cc8c54b7f75f7364fb15a3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 11 15:40:46 2010 +0100

    fix x86 cppunit build problem

 libreoffice-buildfix.patch |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/libreoffice-buildfix.patch b/libreoffice-buildfix.patch
index 22a8899..aadea13 100644
--- a/libreoffice-buildfix.patch
+++ b/libreoffice-buildfix.patch
@@ -66,3 +66,18 @@
  uk \
  uz \
  ve \
+--- a/configure.in
++++ b/configure.in
+@@ -3815,12 +3815,6 @@ if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \
+     SYSTEM_CPPUNIT=YES
+     # might work for earlier, too but go sure
+     PKG_CHECK_MODULES( CPPUNIT, cppunit >= 1.12.0 )
+-    AC_MSG_CHECKING([STL compatibility])
+-    if test "$WITH_STLPORT" != "no"; then
+-	AC_MSG_ERROR([to use system cppunit you need to use --without-stlport])
+-    else
+-	AC_MSG_RESULT([OK])	
+-    fi
+ else
+     AC_MSG_RESULT([internal])
+     SYSTEM_CPPUNIT=NO


More information about the scm-commits mailing list