diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-11-10 16:29:16 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-11-10 19:06:34 +0100 |
| commit | 7f8b5c092deb0a74aac18f1901e12e58b3a51493 (patch) | |
| tree | e1da74fb68e4f2f535d11ebeaa6e22e44851155b | |
| parent | b80dd040e532d651168e171acd3ad194a284438a (diff) | |
external/gpgmepp: Adapt to _AC_UNDECLARED_WARNING in autoconf 2.70beta
see the linked
<https://lists.gnu.org/archive/html/autoconf/2020-11/msg00004.html> "Fallout
from _AC_UNDECLARED_WARNING in autoconf 2.70beta" for details
Change-Id: I02c0f41d8f9e2ec7f833423a55ccbfff19e5ceb8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105555
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | external/gpgmepp/UnpackedTarball_gpgmepp.mk | 4 | ||||
| -rw-r--r-- | external/gpgmepp/configure.patch | 34 |
2 files changed, 38 insertions, 0 deletions
diff --git a/external/gpgmepp/UnpackedTarball_gpgmepp.mk b/external/gpgmepp/UnpackedTarball_gpgmepp.mk index b2feb6ebc2b7..2e9eb3d826ff 100644 --- a/external/gpgmepp/UnpackedTarball_gpgmepp.mk +++ b/external/gpgmepp/UnpackedTarball_gpgmepp.mk @@ -13,6 +13,9 @@ $(eval $(call gb_UnpackedTarball_set_tarball,gpgmepp,$(GPGME_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,gpgmepp,0)) +# * external/gpgmepp/configure.patch: see +# <https://lists.gnu.org/archive/html/autoconf/2020-11/msg00004.html> "Fallout from +# _AC_UNDECLARED_WARNING in autoconf 2.70beta" for upstream discussion $(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \ external/gpgmepp/find-libgpg-error-libassuan.patch \ external/gpgmepp/fix-autoconf-macros.patch \ @@ -30,5 +33,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \ external/gpgmepp/ubsan.patch \ external/gpgmepp/c++20.patch \ external/gpgmepp/clang-cl.patch \ + external/gpgmepp/configure.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/gpgmepp/configure.patch b/external/gpgmepp/configure.patch new file mode 100644 index 000000000000..4b51db6bebad --- /dev/null +++ b/external/gpgmepp/configure.patch @@ -0,0 +1,34 @@ +--- configure.ac ++++ configure.ac +@@ -619,6 +619,15 @@ + AC_SUBST(API__SSIZE_T) + AM_SUBST_NOTMAKE(API__SSIZE_T) + ++# Try to find a thread-safe version of ttyname(). ++gnupg_REPLACE_TTYNAME_R ++if test "$ac_cv_func_ttyname_r" != yes; then ++ AC_MSG_WARN([ ++*** ++*** ttyname() is not thread-safe and ttyname_r() does not exist ++***]) ++fi ++ + # Checks for compiler features. + if test "$GCC" = yes; then + CFLAGS="$CFLAGS -Wall -Wcast-align -Wshadow -Wstrict-prototypes" +@@ -679,15 +679,6 @@ + + AC_FUNC_FSEEKO + +-# Try to find a thread-safe version of ttyname(). +-gnupg_REPLACE_TTYNAME_R +-if test "$ac_cv_func_ttyname_r" != yes; then +- AC_MSG_WARN([ +-*** +-*** ttyname() is not thread-safe and ttyname_r() does not exist +-***]) +-fi +- + # Try to find a thread-safe version of getenv(). + have_thread_safe_getenv=no + jm_GLIBC21 |