From 722d8bf10bfca7b4d9fd71bf05b7b97d3387080a Mon Sep 17 00:00:00 2001 From: ramonn Date: Tue, 15 Nov 2011 13:10:24 +0000 Subject: [PATCH] 2011-11-15 Ramon Novoa * build.sh, modules/pandora_module_odbc.cc, Makefile.am: Made changes to cross-compile in openSUSE 11.4. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5135 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/win32/ChangeLog | 5 +++++ pandora_agents/win32/Makefile.am | 2 +- pandora_agents/win32/build.sh | 2 +- pandora_agents/win32/modules/pandora_module_odbc.cc | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog index d018ba0023..3040c7ca77 100644 --- a/pandora_agents/win32/ChangeLog +++ b/pandora_agents/win32/ChangeLog @@ -1,3 +1,8 @@ +2011-11-15 Ramon Novoa + + * build.sh, modules/pandora_module_odbc.cc, Makefile.am: Made + changes to cross-compile in openSUSE 11.4. + 2011-11-03 Ramon Novoa * pandora_windows_service.h, diff --git a/pandora_agents/win32/Makefile.am b/pandora_agents/win32/Makefile.am index 5398556a85..f47c4b1f5e 100644 --- a/pandora_agents/win32/Makefile.am +++ b/pandora_agents/win32/Makefile.am @@ -6,7 +6,7 @@ else PandoraAgent_SOURCES = misc/pandora_file.cc modules/pandora_data.cc modules/pandora_module_factory.cc modules/pandora_module.cc modules/pandora_module_list.cc modules/pandora_module_plugin.cc modules/pandora_module_inventory.cc modules/pandora_module_freememory.cc modules/pandora_module_exec.cc modules/pandora_module_odbc.cc modules/pandora_module_perfcounter.cc modules/pandora_module_proc.cc modules/pandora_module_tcpcheck.cc modules/pandora_module_freememory_percent.cc modules/pandora_module_freedisk.cc modules/pandora_module_freedisk_percent.cc modules/pandora_module_logevent.cc modules/pandora_module_service.cc modules/pandora_module_cpuusage.cc modules/pandora_module_wmiquery.cc modules/pandora_module_regexp.cc udp_server/udp_server.cc main.cc pandora_strutils.cc pandora.cc windows_service.cc pandora_agent_conf.cc windows/pandora_windows_info.cc windows/pandora_wmi.cc pandora_windows_service.cc misc/md5.c windows/wmi/disphelper.c ssh/libssh2/channel.c ssh/libssh2/mac.c ssh/libssh2/session.c ssh/libssh2/comp.c ssh/libssh2/misc.c ssh/libssh2/sftp.c ssh/libssh2/crypt.c ssh/libssh2/packet.c ssh/libssh2/userauth.c ssh/libssh2/hostkey.c ssh/libssh2/publickey.c ssh/libssh2/kex.c ssh/libssh2/scp.c ssh/pandora_ssh_client.cc ssh/pandora_ssh_test.cc ftp/pandora_ftp_client.cc ftp/pandora_ftp_test.cc PandoraAgent_CXXFLAGS=-O2 -DCURL_STATICLIB endif -PandoraAgent_LDFLAGS=-enable-auto-import -static-libgcc -static-libstdc++ +PandoraAgent_LDFLAGS=-static-libgcc -static-libstdc++ LDADD = versioninfo.res diff --git a/pandora_agents/win32/build.sh b/pandora_agents/win32/build.sh index e8fe370400..46f3182735 100755 --- a/pandora_agents/win32/build.sh +++ b/pandora_agents/win32/build.sh @@ -6,7 +6,7 @@ DIST=`lsb_release -i | awk '{print $3}'` HOST="i586-mingw32msvc" if [ "$DIST" == "SUSE" ]; then - HOST="i686-pc-mingw32" + HOST="i686-w64-mingw32" fi ./autogen.sh && ./configure --host=$HOST && make clean && make && cp PandoraAgent.exe bin/ && installjammer --build installer/pandora.mpi diff --git a/pandora_agents/win32/modules/pandora_module_odbc.cc b/pandora_agents/win32/modules/pandora_module_odbc.cc index 33cdffdfe7..c3c6b3e0e3 100755 --- a/pandora_agents/win32/modules/pandora_module_odbc.cc +++ b/pandora_agents/win32/modules/pandora_module_odbc.cc @@ -44,7 +44,7 @@ Pandora_Module_Odbc::Pandora_Module_Odbc (string name, string query) : Pandora_Module (name) { - Pandora_Agent_Conf::Pandora_Agent_Conf *conf; + Pandora_Agent_Conf *conf; conf = Pandora_Agent_Conf::getInstance ();