From e2abeb11cf1579c0c50d8f4607d9e6f38babaedf Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 10 Mar 2019 10:02:38 +0000 Subject: [PATCH] During the transition from Mk/bsd.qt.mk to Mk/Uses/qt.mk in r473503, a previous change to the former was omitted; in particular, r463394: "Disable Qt4 sql-ibase plugin on not-(i386|amd64) ibase is Firebird, which only builds on i386 and amd64. This patch squashes the ibase plugin for Qt4." Re-apply lost change (databases/qt5-sqldrivers-ibase is x86-only). PR: 236307 Submitted by: linimon --- Mk/Uses/qt.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index 9257cf397466..4bd87c901280 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -140,9 +140,12 @@ _QT_MK_POST_INCLUDED= qt.mk _USE_QT_ALL= assistant dbus declarative designer doc gui help \ imageformats l10n linguist linguisttools multimedia \ network opengl pixeltool qdbusviewer qmake script \ - scripttools sql sql-ibase sql-mysql sql-odbc sql-pgsql \ + scripttools sql sql-mysql sql-odbc sql-pgsql \ sql-sqlite2 sql-sqlite3 svg testlib webkit \ xml xmlpatterns +.if ${ARCH} == amd64 || ${ARCH} == i386 +_USE_QT_ALL+= sql-ibase +.endif _USE_QT4_ONLY= accessible assistant-adp assistantclient clucene codecs-cn codecs-jp \ codecs-kr codecs-tw corelib demo graphicssystems-opengl \