[Libreoffice-commits] .: 2 commits - configure.ac liborcus/ExternalProject_liborcus.mk odk/pack udkapi/com

[Libreoffice Gerrit user]

 configure.ac                         |    5 +++++
 liborcus/ExternalProject_liborcus.mk |    2 ++
 odk/pack/gendocu/uno/package-list    |    2 --
 udkapi/com/sun/star/udk-modules.idl  |    6 ------
 4 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 07f5a7c8ab3c2d36703235b49b66441d804046e1
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Nov 28 22:42:01 2012 +0100

    liborcus: must be built with -D_GLIBCXX_DEBUG for debug STL
    
    ... in --enable-dbgutil mode.
    
    Change-Id: I095bc8f29570afd9912a615e98ef05e4249ea8f7

diff --git a/configure.ac b/configure.ac
index 5ebf6ff..cbbc0f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3306,6 +3306,11 @@ if test -n "$enable_dbgutil" -a "$enable_dbgutil" != "no"; then
     else
         with_system_mysql_cppconn=no
     fi
+    if test "$with_system_orcus" = "yes"; then
+        AC_MSG_ERROR([--with-system-orcus conflicts with --enable-dbgutil])
+    else
+        with_system_orcus=no
+    fi
 else
     ENABLE_DBGUTIL=""
     # PRODUCT is old concept, still used by build.pl .
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index 6e225f9..0c64d86 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -40,6 +40,7 @@ endif
 	
 else
 
+# must be built with debug STL if --enable-dbgutil
 $(call gb_ExternalProject_get_state_target,liborcus,build) :
 	cd $(EXTERNAL_WORKDIR) \
 	&& $(if $(filter ANDROID,$(OS)),LIBS='-lgnustl_shared -lm') \
@@ -51,6 +52,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
 		--disable-debug \
 		--disable-spreadsheet-model \
 		--disable-werror \
+		$(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(gb_ENABLE_DBGUTIL),CPPFLAGS=-D_GLIBCXX_DEBUG)) \
 		$(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(OUTDIR)/inc/external) \
 		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 	&& $(MAKE) \
commit e9ab377670ab12861700f22cb3f88af2e8292ff7
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Nov 28 22:02:37 2012 +0100

    remove removed udkapi modules from more files...
    
    Change-Id: Id57598aebe25b3aeffb7f66ad4f9c2b2159fc240

diff --git a/odk/pack/gendocu/uno/package-list b/odk/pack/gendocu/uno/package-list
index 0e6766d..94e852b 100644
--- a/odk/pack/gendocu/uno/package-list
+++ b/odk/pack/gendocu/uno/package-list
@@ -6,7 +6,6 @@ com.sun.star.chart
 com.sun.star.configuration
 com.sun.star.connection
 com.sun.star.container
-com.sun.star.corba
 com.sun.star.datatransfer
 com.sun.star.document
 com.sun.star.drawing
@@ -43,7 +42,6 @@ com.sun.star.sync2
 com.sun.star.system
 com.sun.star.table
 com.sun.star.task
-com.sun.star.test
 com.sun.star.text
 com.sun.star.ucb
 com.sun.star.ui
diff --git a/udkapi/com/sun/star/udk-modules.idl b/udkapi/com/sun/star/udk-modules.idl
index 604916a..d33104b 100644
--- a/udkapi/com/sun/star/udk-modules.idl
+++ b/udkapi/com/sun/star/udk-modules.idl
@@ -33,9 +33,6 @@ module connection {};
 /// Interfaces for collections and containers.
 module container {};
 
-/// Modules for IOP, IIOP and GIOP.
-module corba {};
-
 /// General input/output interfaces.
 module io {};
 
@@ -60,9 +57,6 @@ module script {};
 /// Interface for authorisation and authentification.
 module security {};
 
-/// Test interfaces for core-reflection, introspection and marshalling.
-module test {};
-
 /// Basic UNO interfaces.
 module uno {};