Kaydet (Commit) e045e971 authored tarafından Thorsten Behrens's avatar Thorsten Behrens Kaydeden (comit) Katarina Behrens

Remove arch-pinning for gpgme on Windows again

With e0d94237 the dependency on gcc
is gone, so we should be able to build on all cygwin flavours again
for all Windows arch targets.

Well almost - we still have windres on cygwin32 only able to produce
pe-i386 targets, so let's exclude the case cyg32 and WIN64 for the
moment.

Change-Id: Ibe7f967585995586985177d4c36cc33d9850d9de
Reviewed-on: https://gerrit.libreoffice.org/45422Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 8444bf1d)
Reviewed-on: https://gerrit.libreoffice.org/45768Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
üst 6fabdde7
......@@ -10138,11 +10138,9 @@ fi
AC_SUBST(ENABLE_PDFIUM)
SYSTEM_GPGMEPP=
# need matching cygwin arch for building gpgme sadly, for the while
if test "$_os" = "Linux" -o "$_os" = "Darwin" \
-o \( "$_os" = "WINNT" -a "$host_cpu" = "i686" -a "$WINDOWS_SDK_ARCH" = "x86" \) \
-o \( "$_os" = "WINNT" -a "$host_cpu" = "x86_64" -a "$WINDOWS_SDK_ARCH" = "x64" \) ; then
-o \( "$_os" = "WINNT" -a "$host_cpu" = "x86_64" \) \
-o \( "$_os" = "WINNT" -a "$host_cpu" = "i686" -a "$WINDOWS_SDK_ARCH" = "x86" \) ; then
dnl ===================================================================
dnl Check for system gpgme
dnl ===================================================================
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment