# HG changeset patch # User Markus Mützel # Date 1696168081 -7200 # Node ID c2892f53d1230205723b5cb6d06d5951d7cd0f2e # Parent 7b5dcd048534d78b7af6605751f2d621e95b0018 Octave: More hints to pick up correct Qt6 tools. * src/default-octave.mk: Set QTPATHS6 to the tool built by MXE Octave when building natively. diff -r 7b5dcd048534 -r c2892f53d123 src/default-octave.mk --- a/src/default-octave.mk Sun Oct 01 15:32:33 2023 +0200 +++ b/src/default-octave.mk Sun Oct 01 15:48:01 2023 +0200 @@ -93,6 +93,9 @@ $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt6/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig" $(PKG)_QTDIR := $(HOST_PREFIX)/qt6 $(PKG)_QT_CONFIGURE_OPTIONS += octave_cv_lib_qscintilla="-lqscintilla2_qt6" + ifeq ($(MXE_NATIVE_BUILD),yes) + $(PKG)_QT_CONFIGURE_OPTIONS += QTPATHS6="$(HOST_PREFIX)/qt6/bin/qtpaths6" + endif endif ifneq ($(ENABLE_DOCS),yes)