GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build,qt: Always compile the Qt 6 test application with -fpic

Browse Source 
* m4/qt6.m4: Do not add -fpic to GPGME_QT6_CFLAGS. Add -fpic to CPPFLAGS
used for build test of simple Qt 6 application.
--

The pkgconfig files of Qt6Core do not contain the qt_config variable,
so that we cannot easily check whether Qt6 was compiled with pic. For
simplicity we always compile the test application with -fpic to avoid
a build failure if Qt6 was actually compiled with pic.
For the actual build of QGpgME libtool automatically uses -fPIC, so that
we don't have to add it to the GPGME_QT6_CFLAGS.
This commit is contained in:
Ingo Klöcker 2022-10-13 15:36:32 +02:00
parent e6a1b241b4
commit f7a4671428
No known key found for this signature in database
GPG Key ID: F5A5D1692277A1E9
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
m4/qt6.m4
View File

@ -23,11 +23,6 @@ AC_DEFUN([FIND_QT6],
[have_qt6test_libs="yes"], [have_qt6test_libs="yes"],
[have_qt6test_libs="no"]) [have_qt6test_libs="no"])
if ! test "$have_w32_system" = yes; then
if "$PKG_CONFIG" --variable qt_config Qt6Core | grep -q "reduce_relocations"; then
GPGME_QT6_CFLAGS="$GPGME_QT6_CFLAGS -fpic"
fi
fi
if test "$have_qt6_libs" = "yes"; then if test "$have_qt6_libs" = "yes"; then
# Qt6 moved moc to libexec # Qt6 moved moc to libexec
qt6libexecdir=$($PKG_CONFIG --variable=libexecdir 'Qt6Core >= 6.4.0') qt6libexecdir=$($PKG_CONFIG --variable=libexecdir 'Qt6Core >= 6.4.0')
@ -64,6 +59,9 @@ AC_DEFUN([FIND_QT6],
dnl for host. dnl for host.
OLDCPPFLAGS=$CPPFLAGS OLDCPPFLAGS=$CPPFLAGS
CPPFLAGS=$GPGME_QT6_CFLAGS CPPFLAGS=$GPGME_QT6_CFLAGS
if ! test "$have_w32_system" = yes; then
CPPFLAGS="$CPPFLAGS -fpic"
fi
OLDLIBS=$LIBS OLDLIBS=$LIBS
LIBS=$GPGME_QT6_LIBS LIBS=$GPGME_QT6_LIBS
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)