Date: Fri, 19 May 2023 05:37:58 GMT From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0f24404c0a02 - main - devel/qt6-base: remove SQL options Message-ID: <202305190537.34J5bw3t053358@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=0f24404c0a0213603d0f270970394c5255c415cb commit 0f24404c0a0213603d0f270970394c5255c415cb Author: Tobias C. Berner <tcberner@FreeBSD.org> AuthorDate: 2023-04-29 05:41:56 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> CommitDate: 2023-05-19 05:36:45 +0000 devel/qt6-base: remove SQL options --- devel/qt6-base/Makefile | 37 +++++++------------------------------ devel/qt6-base/pkg-plist | 33 ++------------------------------- 2 files changed, 9 insertions(+), 61 deletions(-) diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile index 0c45cbbf94b2..e15d9474c250 100644 --- a/devel/qt6-base/Makefile +++ b/devel/qt6-base/Makefile @@ -72,6 +72,12 @@ CMAKE_ON= QT_AVOID_CMAKE_ARCHIVING_API \ QT_FIND_ALL_PACKAGES_ALWAYS CMAKE_OFF= QT_FEATURE_eglfs \ QT_FEATURE_gssapi +# sql drivers are handled in the qt6-base-sqldriver port +CMAKE_OFF+= FEATURE_sql_mysql \ + FEATURE_sql_odbc \ + FEATURE_sql_psql \ + FEATURE_sql_sqlite + SHEBANG_FILES= ${WRKSRC}/mkspecs/features/uikit/device_destinations.sh \ ${WRKSRC}/mkspecs/features/uikit/devices.py \ ${WRKSRC}/mkspecs/features/data/mac/objc_namespace.sh \ @@ -83,41 +89,12 @@ USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BINARY_ALIAS= zstd=${LOCALBASE}/bin/zstd OPTIONS_DEFINE= CUPS -OPTIONS_GROUP= SQL -OPTIONS_GROUP_SQL= IBASE MYSQL ODBC PSQL SQLITE -OPTIONS_DEFAULT= CUPS SQLITE +OPTIONS_DEFAULT= CUPS OPTIONS_SUB= yes CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_CMAKE_OFF= -DFEATURE_cups=OFF -IBASE_DESC= InterBase database support -IBASE_CMAKE_ON= -DFEATURE_sql_ibase=ON -IBASE_CMAKE_OFF= -DFEATURE_sql_ibase=OFF -IBASE_USES= firebird:4.0 -IBASE_BROKEN= IBASE: fatal error: 'gen/iberror.h' file not found - -MYSQL_DESC= MySQL database support -MYSQL_CMAKE_ON= -DFEATURE_sql_mysql=ON -MYSQL_CMAKE_OFF= -DFEATURE_sql_mysql=OFF -MYSQL_USES= mysql - -ODBC_DESC= ODBC database support -ODBC_CMAKE_ON= -DFEATURE_sql_odbc=ON -ODBC_CMAKE_OFF= -DFEATURE_sql_odbc=OFF -ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC - -PSQL_DESC= PostgreSQL database support -PSQL_CMAKE_ON= -DFEATURE_sql_psql=ON -PSQL_CMAKE_OFF= -DFEATURE_sql_psql=OFF -PSQL_USES= pgsql - -SQLITE_DESC= Sqlite database support -SQLITE_CMAKE_ON= -DFEATURE_sql_sqlite=ON \ - -DQT_FEATURE_system_sqlite=ON -SQLITE_CMAKE_OFF= -DFEATURE_sql_sqlite=OFF -SQLITE_USES= sqlite:3 - .include <bsd.port.pre.mk> .if ${ARCH} == "armv6" || ${ARCH} == "armv7" diff --git a/devel/qt6-base/pkg-plist b/devel/qt6-base/pkg-plist index c7a06dabe10a..e7d50074d235 100644 --- a/devel/qt6-base/pkg-plist +++ b/devel/qt6-base/pkg-plist @@ -2486,10 +2486,10 @@ lib/cmake/Qt6/FindLibproxy.cmake lib/cmake/Qt6/FindLibsystemd.cmake lib/cmake/Qt6/FindLibudev.cmake lib/cmake/Qt6/FindMtdev.cmake -%%MYSQL%%lib/cmake/Qt6/FindMySQL.cmake +lib/cmake/Qt6/FindMySQL.cmake lib/cmake/Qt6/FindOracle.cmake lib/cmake/Qt6/FindPPS.cmake -%%PSQL%%lib/cmake/Qt6/FindPostgreSQL.cmake +lib/cmake/Qt6/FindPostgreSQL.cmake lib/cmake/Qt6/FindSlog2.cmake lib/cmake/Qt6/FindTslib.cmake lib/cmake/Qt6/FindWrapAtomic.cmake @@ -2919,36 +2919,11 @@ lib/cmake/Qt6PrintSupport/Qt6PrintSupportVersionlessTargets.cmake %%CUPS%%lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginConfigVersionImpl.cmake %%CUPS%%lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake %%CUPS%%lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginTargets.cmake -%%MYSQL%%lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginAdditionalTargetInfo.cmake -%%MYSQL%%lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfig.cmake -%%MYSQL%%lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfigVersion.cmake -%%MYSQL%%lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfigVersionImpl.cmake -%%MYSQL%%lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake -%%MYSQL%%lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginTargets.cmake -%%ODBC%%lib/cmake/Qt6Sql/Qt6QODBCDriverPluginAdditionalTargetInfo.cmake -%%ODBC%%lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfig.cmake -%%ODBC%%lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfigVersion.cmake -%%ODBC%%lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfigVersionImpl.cmake -%%ODBC%%lib/cmake/Qt6Sql/Qt6QODBCDriverPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake -%%ODBC%%lib/cmake/Qt6Sql/Qt6QODBCDriverPluginTargets.cmake -%%PSQL%%lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginAdditionalTargetInfo.cmake -%%PSQL%%lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginConfig.cmake -%%PSQL%%lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginConfigVersion.cmake -%%PSQL%%lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginConfigVersionImpl.cmake -%%PSQL%%lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake -%%PSQL%%lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginTargets.cmake -%%SQLITE%%lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginAdditionalTargetInfo.cmake -%%SQLITE%%lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfig.cmake -%%SQLITE%%lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfigVersion.cmake -%%SQLITE%%lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfigVersionImpl.cmake -%%SQLITE%%lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake -%%SQLITE%%lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginTargets.cmake lib/cmake/Qt6Sql/Qt6SqlAdditionalTargetInfo.cmake lib/cmake/Qt6Sql/Qt6SqlConfig.cmake lib/cmake/Qt6Sql/Qt6SqlConfigVersion.cmake lib/cmake/Qt6Sql/Qt6SqlConfigVersionImpl.cmake lib/cmake/Qt6Sql/Qt6SqlDependencies.cmake -lib/cmake/Qt6Sql/Qt6SqlPlugins.cmake lib/cmake/Qt6Sql/Qt6SqlTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Sql/Qt6SqlTargets.cmake lib/cmake/Qt6Sql/Qt6SqlVersionlessTargets.cmake @@ -3601,10 +3576,6 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake %%QT_PLUGINDIR%%/platformthemes/libqgtk3.so %%QT_PLUGINDIR%%/platformthemes/libqxdgdesktopportal.so %%CUPS%%%%QT_PLUGINDIR%%/printsupport/libcupsprintersupport.so -%%SQLITE%%%%QT_PLUGINDIR%%/sqldrivers/libqsqlite.so -%%MYSQL%%%%QT_PLUGINDIR%%/sqldrivers/libqsqlmysql.so -%%ODBC%%%%QT_PLUGINDIR%%/sqldrivers/libqsqlodbc.so -%%PSQL%%%%QT_PLUGINDIR%%/sqldrivers/libqsqlpsql.so %%QT_PLUGINDIR%%/tls/libqcertonlybackend.so %%QT_PLUGINDIR%%/tls/libqopensslbackend.so %%QT_PLUGINDIR%%/xcbglintegrations/libqxcb-egl-integration.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305190537.34J5bw3t053358>