From 927f129663b8bde1ecb4e2ac2b233a7baca8a568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Thu, 21 Sep 2023 10:56:26 +0200 Subject: [PATCH] build,qt: Optionally build Qt 6 bindings with -mno-direct-extern-access * configure.ac: Check if C++ compiler supports -mno-direct-extern-access. Add option to enable building with -mno-direct-extern-access. * m4/ax_check_compile_flag.m4: New. * m4/qt6.m4: Add -mno-direct-extern-access to GPGME_QT6_CFLAGS if supported and requested. -- This adds the possibility to build the Qt 6 bindings with the -mno-direct-extern-access flag. This is required if Qt 6 was built with this flag. This is a workaround for the lack of Qt 6's pkgconfig files providing this flag if needed. GnuPG-bug-id: 6696 --- configure.ac | 19 +++++++++++++ m4/ax_check_compile_flag.m4 | 53 +++++++++++++++++++++++++++++++++++++ m4/qt6.m4 | 6 +++++ 3 files changed, 78 insertions(+) create mode 100644 m4/ax_check_compile_flag.m4 diff --git a/configure.ac b/configure.ac index 3115ec28..b70e31e5 100644 --- a/configure.ac +++ b/configure.ac @@ -338,6 +338,25 @@ if test x$fixed_search_path != x ; then [Locate binaries only via this PATH]) fi +# Option --enable-no-direct-extern-access +# +# Some distributions build Qt 6 with -mno-direct-extern-access. Libraries and +# applications using Qt then must also be build with this flag. As workaround +# for a bug in Qt's pkgconfig files which don't have this flag we allow +# building with this flag explicitly. +AC_LANG_PUSH(C++) +AX_CHECK_COMPILE_FLAG([-mno-direct-extern-access], + [have_no_direct_extern_access="yes"], + [have_no_direct_extern_access="no"], + [-Werror]) +AC_LANG_POP() +AC_ARG_ENABLE([no-direct-extern-access], + AS_HELP_STRING([--enable-no-direct-extern-access], + [build Qt 6 bindinds with + -mno-direct-extern-access]), + [use_no_direct_extern_access="$enableval"], + [use_no_direct_extern_access=""]) + # Note: You need to declare all possible languages also in # lang/Makefile.am's DIST_SUBDIRS. diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 new file mode 100644 index 00000000..bd753b34 --- /dev/null +++ b/m4/ax_check_compile_flag.m4 @@ -0,0 +1,53 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's compiler +# or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AC_DEFUN([AX_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) +AS_VAR_IF(CACHEVAR,yes, + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS diff --git a/m4/qt6.m4 b/m4/qt6.m4 index df9e2d52..f317eace 100644 --- a/m4/qt6.m4 +++ b/m4/qt6.m4 @@ -32,7 +32,13 @@ AC_DEFUN([FIND_QT6], have_qt6_libs="no"; fi fi + if test "$have_qt6_libs" = "yes"; then + if test "$have_no_direct_extern_access" = "yes" \ + && test "$use_no_direct_extern_access" = "yes"; then + GPGME_QT6_CFLAGS="$GPGME_QT6_CFLAGS -mno-direct-extern-access" + fi + dnl Check that a binary can actually be build with this qt. dnl pkg-config may be set up in a way that it looks also for libraries dnl of the build system and not only for the host system. In that case