disable running contests when cross compiling

This commit is contained in:
git@daemon.de
2014-09-17 10:02:06 +02:00
parent 2868caa7de
commit 83912a1d16
2 changed files with 13 additions and 5 deletions

View File

@@ -123,6 +123,7 @@ AC_TRY_LINK([
AC_CHECK_DECLS([be64enc], [], [], [[#include <sys/endian.h>]]) AC_CHECK_DECLS([be64enc], [], [], [[#include <sys/endian.h>]])
AC_CHECK_FUNCS(posix_memalign) AC_CHECK_FUNCS(posix_memalign)
cross_compile="no"
AC_MSG_CHECKING([compiler and flags for sanity]) AC_MSG_CHECKING([compiler and flags for sanity])
AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h> ]], [[ exit(0); ]])], AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h> ]], [[ exit(0); ]])],
[ AC_MSG_RESULT([yes]) ], [ AC_MSG_RESULT([yes]) ],
@@ -130,7 +131,10 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h> ]], [[ exit(0); ]])],
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
AC_MSG_ERROR([*** compiler cannot create working executables, check config.log ***]) AC_MSG_ERROR([*** compiler cannot create working executables, check config.log ***])
], ],
[ AC_MSG_WARN([cross compiling: not checking compiler sanity]) ] [
AC_MSG_WARN([cross compiling: not checking compiler sanity])
[cross_compile="yes"]
]
) )
_havenacl=no _havenacl=no
@@ -248,6 +252,7 @@ if test -n "$_ldlib"; then
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${_ldlib}" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${_ldlib}"
fi fi
if test "$cross_compile" = "no"; then
AC_MSG_CHECKING([is libsodium compiled correctly]) AC_MSG_CHECKING([is libsodium compiled correctly])
AC_RUN_IFELSE([ AC_RUN_IFELSE([
AC_LANG_PROGRAM([[ AC_LANG_PROGRAM([[
@@ -263,8 +268,9 @@ AC_LANG_PROGRAM([[
AC_MSG_ERROR([no. please check your libsodium installation, consider re-installing]) AC_MSG_ERROR([no. please check your libsodium installation, consider re-installing])
] ]
) )
fi
if test "$cross_compile" = "no"; then
# check endianess # check endianess
# program returns 0 on little and 1 on big endian systems # program returns 0 on little and 1 on big endian systems
AC_MSG_CHECKING([are we on a big endian system]) AC_MSG_CHECKING([are we on a big endian system])
@@ -279,6 +285,7 @@ AC_LANG_PROGRAM([[]],[[long one= 1; exit(!(*((char *)(&one)))); ]])],
bigendian=1 bigendian=1
] ]
) )
fi
if test -n "$bigendian"; then if test -n "$bigendian"; then
CFLAGS="$CFLAGS -D__CPU_IS_BIG_ENDIAN=1" CFLAGS="$CFLAGS -D__CPU_IS_BIG_ENDIAN=1"

View File

@@ -8,6 +8,7 @@ extern "C" {
#include "pcp/config.h" #include "pcp/config.h"
#include "pcp/base85.h" #include "pcp/base85.h"
#include "pcp/buffer.h" #include "pcp/buffer.h"
#include "pcp/config.h"
#include "pcp/context.h" #include "pcp/context.h"
#include "pcp/crypto.h" #include "pcp/crypto.h"
#include "pcp/defines.h" #include "pcp/defines.h"