From f034c259260a9683b34d720e3a35c523e8579e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=BCtzel?= Date: Fri, 18 Oct 2024 19:56:15 +0200 Subject: [PATCH] build: Remove workaround for -F in Qt linker flags on macOS. * m4/acinclude.m4 (OCTAVE_CHECK_QT_VERSION): It doesn't seem to be necessary to link all dependencies with Qt on macOS any longer. Remove work-around that dates back to January 2014. * configure.ac (link-all-dependencies): Adjust documentation. --- configure.ac | 2 +- m4/acinclude.m4 | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 61579ed536..1feb3d4b35 100644 --- a/configure.ac +++ b/configure.ac @@ -690,7 +690,7 @@ case $host_os in esac AC_ARG_ENABLE([link-all-dependencies], [AS_HELP_STRING([--enable-link-all-dependencies], - [link Octave and its shared libraries with all dependencies, not just those immediately referenced (should not be needed on most systems). This is done by default for cygwin* or darwin* hosts.])], + [link Octave and its shared libraries with all dependencies, not just those immediately referenced (should not be needed on most systems). This is done by default for cygwin* hosts.])], [case $enableval in yes) link_all_deps=yes ;; no) link_all_deps=no ;; diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index ccfb7df89c..64bb21dcc5 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -2109,12 +2109,6 @@ AC_DEFUN([OCTAVE_CHECK_QT_VERSION], [AC_MSG_CHECKING([Qt version $1]) if test -z "$QT_LIBS"; then QT_LDFLAGS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -e '-F' | uniq | tr '\n' ' '`" QT_LIBS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`" - ## Enabling link_all_deps works around libtool's imperfect handling - ## of the -F flag - if test -n "$QT_LDFLAGS"; then - link_all_deps=yes - fi - AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], [test $link_all_deps = yes]) fi ;; esac