[Libreoffice-commits] .: 3 commits - sal/Executable_cppunittester.mk sal/Module_sal.mk sal/osl

[Tor Lillqvist]

 sal/Executable_cppunittester.mk |    8 ++++++++
 sal/Module_sal.mk               |    3 ++-
 sal/osl/unx/process.cxx         |    2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 90b50bc14830c7f9d2aee27708e4d690df559b5c
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jan 3 11:38:21 2012 +0200

    Actually we should not build a normal cppunittester executable for iOS at all

diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 556c67e..92950ac 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -29,7 +29,8 @@
 $(eval $(call gb_Module_Module,sal))
 
 $(eval $(call gb_Module_add_targets,sal,\
-	Executable_cppunittester \
+	$(if $(filter $(OS),IOS),,\
+		Executable_cppunittester) \
 	$(if $(filter $(OS),ANDROID), \
 		Library_lo-bootstrap) \
 	Library_sal \
commit bf2d6d8d0487b13a3996463aa755bdcd73f410c6
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jan 3 11:34:44 2012 +0200

    Need to compile cppunittester as Objective-C++ for iOS

diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk
index d6adc3c..0fc9799 100644
--- a/sal/Executable_cppunittester.mk
+++ b/sal/Executable_cppunittester.mk
@@ -32,6 +32,14 @@ $(eval $(call gb_Executable_set_include,cppunit/cppunittester,\
 	-I$(realpath $(SRCDIR)/sal/inc) \
 ))
 
+ifeq ($(OS),IOS)
+
+$(eval $(call gb_Executable_add_cxxflags,cppunit/cppunittester,\
+	 $(gb_OBJCXXFLAGS) \
+))
+
+endif
+
 $(eval $(call gb_Executable_add_linked_libs,cppunit/cppunittester,\
 	sal \
 	$(gb_STDLIBS) \
commit 2ad20308edf6ece3ddc6f5ae30ec2540f4eab5f1
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jan 3 11:06:23 2012 +0200

    WaE: deprecated conversion from string constant to 'char*'

diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index 57bc717..49a57e2 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -500,7 +500,7 @@ static void ChildStatusProc(void *pData)
 
             if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0))
                 OSL_TRACE("Failed to change uid and guid, errno=%d (%s)", errno, strerror(errno));
-#if defined(LINUX) || defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY)
+#if defined(LINUX) || defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(IOS) || defined(DRAGONFLY)
             unsetenv("HOME");
 #else
             putenv("HOME=");