colin
/
tripwire-open-source
mirror of https://github.com/Tripwire/tripwire-open-source.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build fixes for Android. Cross-compiling for any platform currently requires configuring with the --disable-openssl option, due to use of an AC_TRY_RUN macro for OpenSSL detection. Depending on the targeted Android version, it may be necessary to supply 'CFLAGS=-fPIE' and 'LDFLAGS=-fPIE -pie' to create runnable binaries.

This commit is contained in:
Brian Cox 2016-03-29 00:04:40 -07:00
parent 2038ff627d
commit 5490bd3a2f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/twadmin/twadmincl.cpp
View File

@ -62,8 +62,8 @@
#include "twcrypto/crypto.h" #include "twcrypto/crypto.h"
#include "core/displayencoder.h" #include "core/displayencoder.h"
//Syllable OS doesn't provide swab(), so we'll borrow one from glibc. //Provide a swab() impl. from glibc, for platforms that don't have one
#ifdef __SYLLABLE__ #if defined(__SYLLABLE__) || defined(__ANDROID_API__)
void swab (const void *bfrom, void *bto, ssize_t n) void swab (const void *bfrom, void *bto, ssize_t n)
{ {
const char *from = (const char *) bfrom; const char *from = (const char *) bfrom;

5
src/twparser/policyparser.cpp
View File

@ -216,8 +216,12 @@ std::string convert_to_encoded_hex( char ch )
return sstr.str(); return sstr.str();
} }
std::string util_ConvertMB( const std::string& sIn ) std::string util_ConvertMB( const std::string& sIn )
{ {
#if defined(__ANDROID_API__) || defined(__AROS__)
return sIn;
#else
cDebug d( "cPolicyParser::util_ConvertMB" ); cDebug d( "cPolicyParser::util_ConvertMB" );
std::string sOut; std::string sOut;
@ -265,5 +269,6 @@ std::string util_ConvertMB( const std::string& sIn )
} }
return sOut; return sOut;
#endif
} }