XNU build fixes.

This commit is contained in:
Gunnar Beutner 2013-03-14 15:14:07 +01:00
parent 77461e650a
commit 49620ef0ed
13 changed files with 22 additions and 2 deletions

View File

@ -32,6 +32,7 @@ libchecker_la_LDFLAGS = \
libchecker_la_LIBADD = \
$(BOOST_SIGNALS_LIB) \
$(BOOST_THREAD_LIB) \
$(BOOST_SYSTEM_LIB) \
${top_builddir}/lib/base/libbase.la \
${top_builddir}/lib/config/libconfig.la \
${top_builddir}/lib/remoting/libremoting.la \

View File

@ -32,6 +32,7 @@ libcompat_la_LDFLAGS = \
libcompat_la_LIBADD = \
$(BOOST_SIGNALS_LIB) \
$(BOOST_THREAD_LIB) \
$(BOOST_SYSTEM_LIB) \
${top_builddir}/lib/base/libbase.la \
${top_builddir}/lib/config/libconfig.la \
${top_builddir}/lib/remoting/libremoting.la \

View File

@ -32,6 +32,7 @@ libdelegation_la_LDFLAGS = \
libdelegation_la_LIBADD = \
$(BOOST_SIGNALS_LIB) \
$(BOOST_THREAD_LIB) \
$(BOOST_SYSTEM_LIB) \
${top_builddir}/lib/base/libbase.la \
${top_builddir}/lib/config/libconfig.la \
${top_builddir}/lib/remoting/libremoting.la \

View File

@ -32,6 +32,7 @@ libdemo_la_LDFLAGS = \
libdemo_la_LIBADD = \
$(BOOST_SIGNALS_LIB) \
$(BOOST_THREAD_LIB) \
$(BOOST_SYSTEM_LIB) \
${top_builddir}/lib/base/libbase.la \
${top_builddir}/lib/config/libconfig.la \
${top_builddir}/lib/remoting/libremoting.la \

View File

@ -66,6 +66,7 @@ liblivestatus_la_LDFLAGS = \
liblivestatus_la_LIBADD = \
$(BOOST_SIGNALS_LIB) \
$(BOOST_THREAD_LIB) \
$(BOOST_SYSTEM_LIB) \
${top_builddir}/lib/base/libbase.la \
${top_builddir}/lib/config/libconfig.la \
${top_builddir}/lib/remoting/libremoting.la \

View File

@ -32,6 +32,7 @@ libnotification_la_LDFLAGS = \
libnotification_la_LIBADD = \
$(BOOST_SIGNALS_LIB) \
$(BOOST_THREAD_LIB) \
$(BOOST_SYSTEM_LIB) \
${top_builddir}/lib/base/libbase.la \
${top_builddir}/lib/config/libconfig.la \
${top_builddir}/lib/remoting/libremoting.la \

View File

@ -32,6 +32,7 @@ libreplication_la_LDFLAGS = \
libreplication_la_LIBADD = \
$(BOOST_SIGNALS_LIB) \
$(BOOST_THREAD_LIB) \
$(BOOST_SYSTEM_LIB) \
${top_builddir}/lib/base/libbase.la \
${top_builddir}/lib/config/libconfig.la \
${top_builddir}/lib/remoting/libremoting.la \

View File

@ -6,3 +6,5 @@ icinga2itl_DATA = \
service.conf \
service-common.conf \
standalone.conf
EXTRA_DIST = $(icinga2itl_DATA)

View File

@ -23,7 +23,7 @@ using namespace icinga;
boost::thread_specific_ptr<StackTrace> Exception::m_LastStackTrace;
#ifndef _WIN32
#if !defined(_WIN32) && !defined(__APPLE__)
extern "C"
void __cxa_throw(void *obj, void *pvtinfo, void (*dest)(void *))
{
@ -53,7 +53,7 @@ void __cxa_throw(void *obj, void *pvtinfo, void (*dest)(void *))
real_cxa_throw(obj, pvtinfo, dest);
}
#endif /* _WIN32 */
#endif /* !_WIN32 && !__APPLE__ */
StackTrace *Exception::GetLastStackTrace(void)
{

View File

@ -27,7 +27,13 @@ using namespace icinga;
condition_variable Process::m_CV;
int Process::m_TaskFd;
Timer::Ptr Process::m_StatusTimer;
#ifndef __APPLE__
extern char **environ;
#else /* __APPLE__ */
#include <crt_externs.h>
#define environ (*_NSGetEnviron())
#endif /* __APPLE__ */
void Process::Initialize(void)
{

View File

@ -52,4 +52,6 @@ libconfig_la_LDFLAGS = \
@VERSION_INFO@
libconfig_la_LIBADD = \
$(BOOST_THREAD_LIB) \
$(BOOST_SYSTEM_LIB) \
${top_builddir}/lib/base/libbase.la

View File

@ -73,6 +73,7 @@ libicinga_la_LDFLAGS = \
libicinga_la_LIBADD = \
$(BOOST_THREAD_LIB) \
$(BOOST_SYSTEM_LIB) \
${top_builddir}/lib/base/libbase.la \
${top_builddir}/lib/config/libconfig.la \
${top_builddir}/lib/remoting/libremoting.la

View File

@ -37,5 +37,7 @@ libremoting_la_LDFLAGS = \
@VERSION_INFO@
libremoting_la_LIBADD = \
$(BOOST_THREAD_LIB) \
$(BOOST_SYSTEM_LIB) \
${top_builddir}/lib/base/libbase.la \
${top_builddir}/lib/config/libconfig.la