mirror of
https://github.com/Icinga/icinga2.git
synced 2025-07-24 22:24:44 +02:00
XNU build fixes.
This commit is contained in:
parent
77461e650a
commit
49620ef0ed
@ -32,6 +32,7 @@ libchecker_la_LDFLAGS = \
|
|||||||
libchecker_la_LIBADD = \
|
libchecker_la_LIBADD = \
|
||||||
$(BOOST_SIGNALS_LIB) \
|
$(BOOST_SIGNALS_LIB) \
|
||||||
$(BOOST_THREAD_LIB) \
|
$(BOOST_THREAD_LIB) \
|
||||||
|
$(BOOST_SYSTEM_LIB) \
|
||||||
${top_builddir}/lib/base/libbase.la \
|
${top_builddir}/lib/base/libbase.la \
|
||||||
${top_builddir}/lib/config/libconfig.la \
|
${top_builddir}/lib/config/libconfig.la \
|
||||||
${top_builddir}/lib/remoting/libremoting.la \
|
${top_builddir}/lib/remoting/libremoting.la \
|
||||||
|
@ -32,6 +32,7 @@ libcompat_la_LDFLAGS = \
|
|||||||
libcompat_la_LIBADD = \
|
libcompat_la_LIBADD = \
|
||||||
$(BOOST_SIGNALS_LIB) \
|
$(BOOST_SIGNALS_LIB) \
|
||||||
$(BOOST_THREAD_LIB) \
|
$(BOOST_THREAD_LIB) \
|
||||||
|
$(BOOST_SYSTEM_LIB) \
|
||||||
${top_builddir}/lib/base/libbase.la \
|
${top_builddir}/lib/base/libbase.la \
|
||||||
${top_builddir}/lib/config/libconfig.la \
|
${top_builddir}/lib/config/libconfig.la \
|
||||||
${top_builddir}/lib/remoting/libremoting.la \
|
${top_builddir}/lib/remoting/libremoting.la \
|
||||||
|
@ -32,6 +32,7 @@ libdelegation_la_LDFLAGS = \
|
|||||||
libdelegation_la_LIBADD = \
|
libdelegation_la_LIBADD = \
|
||||||
$(BOOST_SIGNALS_LIB) \
|
$(BOOST_SIGNALS_LIB) \
|
||||||
$(BOOST_THREAD_LIB) \
|
$(BOOST_THREAD_LIB) \
|
||||||
|
$(BOOST_SYSTEM_LIB) \
|
||||||
${top_builddir}/lib/base/libbase.la \
|
${top_builddir}/lib/base/libbase.la \
|
||||||
${top_builddir}/lib/config/libconfig.la \
|
${top_builddir}/lib/config/libconfig.la \
|
||||||
${top_builddir}/lib/remoting/libremoting.la \
|
${top_builddir}/lib/remoting/libremoting.la \
|
||||||
|
@ -32,6 +32,7 @@ libdemo_la_LDFLAGS = \
|
|||||||
libdemo_la_LIBADD = \
|
libdemo_la_LIBADD = \
|
||||||
$(BOOST_SIGNALS_LIB) \
|
$(BOOST_SIGNALS_LIB) \
|
||||||
$(BOOST_THREAD_LIB) \
|
$(BOOST_THREAD_LIB) \
|
||||||
|
$(BOOST_SYSTEM_LIB) \
|
||||||
${top_builddir}/lib/base/libbase.la \
|
${top_builddir}/lib/base/libbase.la \
|
||||||
${top_builddir}/lib/config/libconfig.la \
|
${top_builddir}/lib/config/libconfig.la \
|
||||||
${top_builddir}/lib/remoting/libremoting.la \
|
${top_builddir}/lib/remoting/libremoting.la \
|
||||||
|
@ -66,6 +66,7 @@ liblivestatus_la_LDFLAGS = \
|
|||||||
liblivestatus_la_LIBADD = \
|
liblivestatus_la_LIBADD = \
|
||||||
$(BOOST_SIGNALS_LIB) \
|
$(BOOST_SIGNALS_LIB) \
|
||||||
$(BOOST_THREAD_LIB) \
|
$(BOOST_THREAD_LIB) \
|
||||||
|
$(BOOST_SYSTEM_LIB) \
|
||||||
${top_builddir}/lib/base/libbase.la \
|
${top_builddir}/lib/base/libbase.la \
|
||||||
${top_builddir}/lib/config/libconfig.la \
|
${top_builddir}/lib/config/libconfig.la \
|
||||||
${top_builddir}/lib/remoting/libremoting.la \
|
${top_builddir}/lib/remoting/libremoting.la \
|
||||||
|
@ -32,6 +32,7 @@ libnotification_la_LDFLAGS = \
|
|||||||
libnotification_la_LIBADD = \
|
libnotification_la_LIBADD = \
|
||||||
$(BOOST_SIGNALS_LIB) \
|
$(BOOST_SIGNALS_LIB) \
|
||||||
$(BOOST_THREAD_LIB) \
|
$(BOOST_THREAD_LIB) \
|
||||||
|
$(BOOST_SYSTEM_LIB) \
|
||||||
${top_builddir}/lib/base/libbase.la \
|
${top_builddir}/lib/base/libbase.la \
|
||||||
${top_builddir}/lib/config/libconfig.la \
|
${top_builddir}/lib/config/libconfig.la \
|
||||||
${top_builddir}/lib/remoting/libremoting.la \
|
${top_builddir}/lib/remoting/libremoting.la \
|
||||||
|
@ -32,6 +32,7 @@ libreplication_la_LDFLAGS = \
|
|||||||
libreplication_la_LIBADD = \
|
libreplication_la_LIBADD = \
|
||||||
$(BOOST_SIGNALS_LIB) \
|
$(BOOST_SIGNALS_LIB) \
|
||||||
$(BOOST_THREAD_LIB) \
|
$(BOOST_THREAD_LIB) \
|
||||||
|
$(BOOST_SYSTEM_LIB) \
|
||||||
${top_builddir}/lib/base/libbase.la \
|
${top_builddir}/lib/base/libbase.la \
|
||||||
${top_builddir}/lib/config/libconfig.la \
|
${top_builddir}/lib/config/libconfig.la \
|
||||||
${top_builddir}/lib/remoting/libremoting.la \
|
${top_builddir}/lib/remoting/libremoting.la \
|
||||||
|
@ -6,3 +6,5 @@ icinga2itl_DATA = \
|
|||||||
service.conf \
|
service.conf \
|
||||||
service-common.conf \
|
service-common.conf \
|
||||||
standalone.conf
|
standalone.conf
|
||||||
|
|
||||||
|
EXTRA_DIST = $(icinga2itl_DATA)
|
||||||
|
@ -23,7 +23,7 @@ using namespace icinga;
|
|||||||
|
|
||||||
boost::thread_specific_ptr<StackTrace> Exception::m_LastStackTrace;
|
boost::thread_specific_ptr<StackTrace> Exception::m_LastStackTrace;
|
||||||
|
|
||||||
#ifndef _WIN32
|
#if !defined(_WIN32) && !defined(__APPLE__)
|
||||||
extern "C"
|
extern "C"
|
||||||
void __cxa_throw(void *obj, void *pvtinfo, void (*dest)(void *))
|
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);
|
real_cxa_throw(obj, pvtinfo, dest);
|
||||||
}
|
}
|
||||||
#endif /* _WIN32 */
|
#endif /* !_WIN32 && !__APPLE__ */
|
||||||
|
|
||||||
StackTrace *Exception::GetLastStackTrace(void)
|
StackTrace *Exception::GetLastStackTrace(void)
|
||||||
{
|
{
|
||||||
|
@ -27,7 +27,13 @@ using namespace icinga;
|
|||||||
condition_variable Process::m_CV;
|
condition_variable Process::m_CV;
|
||||||
int Process::m_TaskFd;
|
int Process::m_TaskFd;
|
||||||
Timer::Ptr Process::m_StatusTimer;
|
Timer::Ptr Process::m_StatusTimer;
|
||||||
|
|
||||||
|
#ifndef __APPLE__
|
||||||
extern char **environ;
|
extern char **environ;
|
||||||
|
#else /* __APPLE__ */
|
||||||
|
#include <crt_externs.h>
|
||||||
|
#define environ (*_NSGetEnviron())
|
||||||
|
#endif /* __APPLE__ */
|
||||||
|
|
||||||
void Process::Initialize(void)
|
void Process::Initialize(void)
|
||||||
{
|
{
|
||||||
|
@ -52,4 +52,6 @@ libconfig_la_LDFLAGS = \
|
|||||||
@VERSION_INFO@
|
@VERSION_INFO@
|
||||||
|
|
||||||
libconfig_la_LIBADD = \
|
libconfig_la_LIBADD = \
|
||||||
|
$(BOOST_THREAD_LIB) \
|
||||||
|
$(BOOST_SYSTEM_LIB) \
|
||||||
${top_builddir}/lib/base/libbase.la
|
${top_builddir}/lib/base/libbase.la
|
||||||
|
@ -73,6 +73,7 @@ libicinga_la_LDFLAGS = \
|
|||||||
|
|
||||||
libicinga_la_LIBADD = \
|
libicinga_la_LIBADD = \
|
||||||
$(BOOST_THREAD_LIB) \
|
$(BOOST_THREAD_LIB) \
|
||||||
|
$(BOOST_SYSTEM_LIB) \
|
||||||
${top_builddir}/lib/base/libbase.la \
|
${top_builddir}/lib/base/libbase.la \
|
||||||
${top_builddir}/lib/config/libconfig.la \
|
${top_builddir}/lib/config/libconfig.la \
|
||||||
${top_builddir}/lib/remoting/libremoting.la
|
${top_builddir}/lib/remoting/libremoting.la
|
||||||
|
@ -37,5 +37,7 @@ libremoting_la_LDFLAGS = \
|
|||||||
@VERSION_INFO@
|
@VERSION_INFO@
|
||||||
|
|
||||||
libremoting_la_LIBADD = \
|
libremoting_la_LIBADD = \
|
||||||
|
$(BOOST_THREAD_LIB) \
|
||||||
|
$(BOOST_SYSTEM_LIB) \
|
||||||
${top_builddir}/lib/base/libbase.la \
|
${top_builddir}/lib/base/libbase.la \
|
||||||
${top_builddir}/lib/config/libconfig.la
|
${top_builddir}/lib/config/libconfig.la
|
||||||
|
Loading…
x
Reference in New Issue
Block a user