[Libreoffice-commits] core.git: 2 commits - boost/boost.wundef.patch.1 cppunit/Module_cppunit.mk test/Module_test.mk unotest/Module_unotest.mk

[Tor Lillqvist]

 boost/boost.wundef.patch.1 |   43 +++++++++++++++++++++++++++++++++++++++++++
 cppunit/Module_cppunit.mk  |    4 ++++
 test/Module_test.mk        |    4 ++++
 unotest/Module_unotest.mk  |    2 ++
 4 files changed, 53 insertions(+)

New commits:
commit 07f98c44311464fd7e5f94f569f847e43a0be4a2
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Apr 2 17:24:09 2013 +0300

    WaE: -Wundef fixes
    
    Change-Id: I0ffb5dc708b565caa52811885ac3724404f6466a

diff --git a/boost/boost.wundef.patch.1 b/boost/boost.wundef.patch.1
index 9814928..cbdac45 100644
--- a/boost/boost.wundef.patch.1
+++ b/boost/boost.wundef.patch.1
@@ -9,3 +9,46 @@
  namespace {
    multi_array_types::extent_gen extents;
    multi_array_types::index_gen indices;
+--- a/boost/interprocess/detail/workaround.hpp
++++ a/boost/interprocess/detail/workaround.hpp
+@@ -29,19 +29,19 @@
+ 
+    #include <unistd.h>
+ 
+-   #if ((_POSIX_THREAD_PROCESS_SHARED - 0) > 0)
++   #if defined(_POSIX_THREAD_PROCESS_SHARED) && ((_POSIX_THREAD_PROCESS_SHARED - 0) > 0)
+    //Cygwin defines _POSIX_THREAD_PROCESS_SHARED but does not implement it.
+    //Mac Os X >= Leopard defines _POSIX_THREAD_PROCESS_SHARED but does not seems to work.
+    #  if !defined(__CYGWIN__) && !defined(__APPLE__)
+    #  define BOOST_INTERPROCESS_POSIX_PROCESS_SHARED
+    #  endif
+    #endif
+    
+-   #if ((_POSIX_BARRIERS - 0) > 0)
++   #if defined(_POSIX_BARRIERS) && ((_POSIX_BARRIERS - 0) > 0)
+    # define BOOST_INTERPROCESS_POSIX_BARRIERS
+    # endif
+ 
+-   #if ((_POSIX_SEMAPHORES - 0) > 0)
++   #if defined(_POSIX_SEMAPHORES) && ((_POSIX_SEMAPHORES - 0) > 0)
+    # define BOOST_INTERPROCESS_POSIX_NAMED_SEMAPHORES
+    #  if defined(__CYGWIN__)
+       #define BOOST_INTERPROCESS_POSIX_SEMAPHORES_NO_UNLINK
+@@ -67,7 +67,7 @@
+    # define BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS
+    #endif
+ 
+-   #if ((_POSIX_SHARED_MEMORY_OBJECTS - 0) > 0)
++   #if defined(_POSIX_SHARED_MEMORY_OBJECTS) && ((_POSIX_SHARED_MEMORY_OBJECTS - 0) > 0)
+    # define BOOST_INTERPROCESS_POSIX_SHARED_MEMORY_OBJECTS
+    #else
+    //VMS and MACOS don't define it but the have shm_open/close interface
+@@ -88,7 +88,7 @@
+    //#  define BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS_ONLY
+    #endif
+ 
+-   #if ((_POSIX_TIMEOUTS - 0) > 0)
++   #if defined(_POSIX_TIMEOUTS) && ((_POSIX_TIMEOUTS - 0) > 0)
+    # define BOOST_INTERPROCESS_POSIX_TIMEOUTS
+    #endif 
+ 
commit 3aa3d170a0f05a2f808f07446f869f38328466e5
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Apr 2 16:02:31 2013 +0300

    Bypass cppunit stuff for non-DESKTOP in more places
    
    We don't run any cppunit tests for cross-compiled platforms anyway, so no
    point in compiling that. (Especially as compiling cppunit currently fails in a
    --enable-werror build at least for Android thanks to -Wundef.)
    
    Change-Id: I3139c62305ccfeddc0f67729f10e224618d2fc03

diff --git a/cppunit/Module_cppunit.mk b/cppunit/Module_cppunit.mk
index 32a3fb8..53ed611 100644
--- a/cppunit/Module_cppunit.mk
+++ b/cppunit/Module_cppunit.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Module_Module,cppunit))
 
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+
 ifeq ($(SYSTEM_CPPUNIT),NO)
 $(eval $(call gb_Module_add_targets,cppunit,\
 	UnpackedTarball_cppunit \
@@ -17,4 +19,6 @@ $(eval $(call gb_Module_add_targets,cppunit,\
 ))
 endif
 
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/test/Module_test.mk b/test/Module_test.mk
index 6c8b81f..9b352a5 100644
--- a/test/Module_test.mk
+++ b/test/Module_test.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Module_Module,test))
 
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+
 $(eval $(call gb_Module_add_targets,test,\
     Library_test \
     Library_subsequenttest \
@@ -34,4 +36,6 @@ $(eval $(call gb_Module_add_targets,test,\
     Package_unittest \
 ))
 
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/unotest/Module_unotest.mk b/unotest/Module_unotest.mk
index 6980b6e..e9eee8f 100644
--- a/unotest/Module_unotest.mk
+++ b/unotest/Module_unotest.mk
@@ -27,12 +27,14 @@
 
 $(eval $(call gb_Module_Module,unotest))
 
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,unotest,\
 	Library_unobootstrapprotector \
 	Library_unoexceptionprotector \
 	Library_unotest \
     Package_inc \
 ))
+endif
 
 ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Module_add_targets,unotest,\