security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

Fix build system for Android by disabling tests since its x-compiled

Browse Source 
* configure.ac (HAVE_ANDROID_SYSTEM, RUN_TESTS): New.
(AH_BOTTOM) [__ANDROID__]: Do not re-define ttyname.
* Makefile.am: Depend tests on new RUN_TESTS conditional.
This commit is contained in:
Hans-Christoph Steiner 2012-08-16 22:43:15 -04:00 committed by Werner Koch
parent 8156a38674
commit 1da04bfb3f
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -82,10 +82,10 @@ else
doc = doc =
endif endif
if HAVE_W32_SYSTEM if RUN_TESTS
tests =
else
tests = tests tests = tests
else
tests =
endif endif
SUBDIRS = m4 gl include common ${kbx} \ SUBDIRS = m4 gl include common ${kbx} \

24
configure.ac
View File

@ -494,13 +494,6 @@ AH_BOTTOM([
# endif # endif
#endif #endif
/* Hacks required for Android. */
#ifdef __ANDROID__
/* ttyname is a stub in BIONIC, printing a FIXME warning. */
# define ttyname broken_native_ttyname
# undef HAVE_TTYNAME
#endif /*__ANDROID__*/
/* Tell libgcrypt not to use its own libgpg-error implementation. */ /* Tell libgcrypt not to use its own libgpg-error implementation. */
#define USE_LIBGPG_ERROR 1 #define USE_LIBGPG_ERROR 1
@ -585,6 +578,8 @@ try_gettext=yes
have_dosish_system=no have_dosish_system=no
have_w32_system=no have_w32_system=no
have_w32ce_system=no have_w32ce_system=no
have_android_system=no
run_tests=yes
use_simple_gettext=no use_simple_gettext=no
use_ldapwrapper=yes use_ldapwrapper=yes
mmap_needed=yes mmap_needed=yes
@ -601,6 +596,7 @@ case "${host}" in
disable_keyserver_path=yes disable_keyserver_path=yes
have_dosish_system=yes have_dosish_system=yes
have_w32_system=yes have_w32_system=yes
run_tests=no
use_ldapwrapper=no # Fixme: Do this only for CE. use_ldapwrapper=no # Fixme: Do this only for CE.
case "${host}" in case "${host}" in
*-mingw32ce*) *-mingw32ce*)
@ -660,6 +656,10 @@ case "${host}" in
;; ;;
m68k-atari-mint) m68k-atari-mint)
;; ;;
*-linux-androideabi)
have_android_system=yes
run_tests=no
;;
*) *)
;; ;;
esac esac
@ -684,6 +684,16 @@ fi
AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes) AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
AM_CONDITIONAL(HAVE_W32CE_SYSTEM, test "$have_w32ce_system" = yes) AM_CONDITIONAL(HAVE_W32CE_SYSTEM, test "$have_w32ce_system" = yes)
if test "$have_android_system" = yes; then
AC_DEFINE(HAVE_ANDROID_SYSTEM,1, [Defined if we build for an Android system])
fi
AM_CONDITIONAL(HAVE_ANDROID_SYSTEM, test "$have_android_system" = yes)
if test "$run_tests" = yes; then
AC_DEFINE(RUN_TESTS,1, [Defined if we should run the tests])
fi
AM_CONDITIONAL(RUN_TESTS, test "$run_tests" = yes)
if test "$use_ldapwrapper" = yes; then if test "$use_ldapwrapper" = yes; then
AC_DEFINE(USE_LDAPWRAPPER,1, [Build dirmngr with LDAP wrapper process]) AC_DEFINE(USE_LDAPWRAPPER,1, [Build dirmngr with LDAP wrapper process])
fi fi