svn commit: r463394 - in head: Mk databases/qt4-ibase-plugin devel/qt4

[Adriaan de Groot]

Author: adridg
Date: Fri Mar  2 13:07:57 2018
New Revision: 463394
URL: https://svnweb.freebsd.org/changeset/ports/463394

Log:
  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.
  
  PR:		216943
  Submitted by:	linimon
  Reported by:	linimon
  Approved by:	tcberner (mentor)
  Differential Revision:	https://reviews.freebsd.org/D14326

Modified:
  head/Mk/bsd.qt.mk
  head/databases/qt4-ibase-plugin/Makefile
  head/devel/qt4/Makefile

Modified: head/Mk/bsd.qt.mk
==============================================================================
--- head/Mk/bsd.qt.mk	Fri Mar  2 13:07:44 2018	(r463393)
+++ head/Mk/bsd.qt.mk	Fri Mar  2 13:07:57 2018	(r463394)
@@ -313,9 +313,12 @@ CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
 _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 \

Modified: head/databases/qt4-ibase-plugin/Makefile
==============================================================================
--- head/databases/qt4-ibase-plugin/Makefile	Fri Mar  2 13:07:44 2018	(r463393)
+++ head/databases/qt4-ibase-plugin/Makefile	Fri Mar  2 13:07:57 2018	(r463394)
@@ -7,4 +7,6 @@ COMMENT=	Qt InterBase/Firebird database plugin
 DB=		ibase
 USES=		firebird
 
+ONLY_FOR_ARCHS=	i386 amd64
+
 .include "${.CURDIR:H:H}/devel/qt4/Makefile.sqldrivers"

Modified: head/devel/qt4/Makefile
==============================================================================
--- head/devel/qt4/Makefile	Fri Mar  2 13:07:44 2018	(r463393)
+++ head/devel/qt4/Makefile	Fri Mar  2 13:07:57 2018	(r463394)
@@ -31,7 +31,7 @@ GSTREAMER_USE=	phonon-gst
 NLS_USE=	l10n
 
 SQL_PLUGINS_DESC=	Install database plugins for QtSql
-SQL_PLUGINS_USE=sql-ibase sql-mysql sql-odbc sql-pgsql sql-sqlite2 \
+SQL_PLUGINS_USE=sql-mysql sql-odbc sql-pgsql sql-sqlite2 \
 		sql-sqlite3
 
 TOOLS_DESC=	Install Qt tools (qmake, moc, etc.)
@@ -43,5 +43,11 @@ TOOLS_USE=	assistant help-tools linguist linguisttools
 .for opt in ${OPTIONS_DEFINE}
 ${opt}_USE:=	${${opt}_USE:S/^/QT4=/:S/$/_run/}
 .endfor
+
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == amd64 || ${ARCH} == i386
+SQL_PLUGINS_USE+=	sql-ibase
+.endif
 
 .include <bsd.port.mk>