configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 8aa13d257eaee42428bea7b649a3ca35903ed551
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date: Mon Dec 4 03:34:01 2017 +0100
Fail when building Win64 from cygwin32
The gpgme libs need cross-arch windres support, which cygwin32
lacks.
Change-Id: Icbe013cf7983754e8b485dd7368cfc10f8fd0bcb
Reviewed-on: https://gerrit.libreoffice.org/45769
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/configure.ac b/configure.ac
index 264e4ba99750..841428971511 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10151,9 +10151,7 @@ fi
AC_SUBST(ENABLE_PDFIUM)
SYSTEM_GPGMEPP=
-if test "$_os" = "Linux" -o "$_os" = "Darwin" \
- -o \( "$_os" = "WINNT" -a "$host_cpu" = "x86_64" \) \
- -o \( "$_os" = "WINNT" -a "$host_cpu" = "i686" -a "$WINDOWS_SDK_ARCH" =
"x86" \) ; then
+if test "$_os" = "Linux" -o "$_os" = "Darwin" -o "$_os" = "WINNT" ; then
dnl ===================================================================
dnl Check for system gpgme
dnl ===================================================================
@@ -10180,6 +10178,8 @@ if test "$_os" = "Linux" -o "$_os" = "Darwin" \
if test "$_os" != "WINNT"; then
GPG_ERROR_LIBS="-L${WORKDIR}/UnpackedTarball/libgpg-error/src/.libs -lgpg-error"
LIBASSUAN_LIBS="-L${WORKDIR}/UnpackedTarball/libassuan/src/.libs
-lassuan"
+ elif test "$host_cpu" = "i686" -a "$WINDOWS_SDK_ARCH" = "x64"; then
+ AC_MSG_ERROR(gpgme cannot be built on cygwin32 for Win64.)
fi
fi
ENABLE_GPGMEPP=TRUE
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
